Skip to content

Commit 47a6f09

Browse files
amaitlandamaitland
committed
Merge branch 'JsBinding_WIP' into JsBinding/Wip2
2 parents 1e5a59e + 08f1ff9 commit 47a6f09

File tree

11 files changed

+40
-7
lines changed

11 files changed

+40
-7
lines changed

‎CefSharp.WinForms/CefSharp.WinForms.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
2121
<PlatformTarget>x64</PlatformTarget>
2222
<OutputPath>bin\x64\Release\</OutputPath>
23+
<DocumentationFile>bin\x64\Release\CefSharp.WinForms.XML</DocumentationFile>
2324
</PropertyGroup>
2425
<PropertyGroup>
2526
<SignAssembly>true</SignAssembly>

‎CefSharp.Wpf/CefSharp.Wpf.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<PlatformTarget>x64</PlatformTarget>
5959
<ErrorReport>prompt</ErrorReport>
6060
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
61+
<DocumentationFile>bin\x64\Release\CefSharp.Wpf.XML</DocumentationFile>
6162
</PropertyGroup>
6263
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
6364
<DebugSymbols>true</DebugSymbols>

‎CefSharp/CefSharp.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<PlatformTarget>x64</PlatformTarget>
7373
<ErrorReport>prompt</ErrorReport>
7474
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
75+
<DocumentationFile>bin\x64\Release\CefSharp.XML</DocumentationFile>
7576
</PropertyGroup>
7677
<ItemGroup>
7778
<Reference Include="System" />

‎CefSharp3.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms.Example",
4141
EndProject
4242
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{A23AA466-1903-44F2-946D-25AD0500D56B}"
4343
ProjectSection(SolutionItems) = preProject
44+
NuGet\CefSharp.Common.nuspec = NuGet\CefSharp.Common.nuspec
45+
NuGet\CefSharp.Common.props = NuGet\CefSharp.Common.props
46+
NuGet\CefSharp.Common.targets = NuGet\CefSharp.Common.targets
47+
NuGet\CefSharp.WinForms.nuspec = NuGet\CefSharp.WinForms.nuspec
48+
NuGet\CefSharp.WinForms.props = NuGet\CefSharp.WinForms.props
4449
NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
4550
NuGet\CefSharp.Wpf.props = NuGet\CefSharp.Wpf.props
4651
NuGet\pack.bat = NuGet\pack.bat

‎NuGet/CefSharp.Common.nuspec‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
<file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.Core.dll" target="CefSharp\x64"/>
2727
<file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x64"/>
2828

29+
<file src="..\Win32\Release\CefSharp.Core.xml" target="CefSharp\x86"/>
30+
<file src="..\x64\Release\CefSharp.Core.xml" target="CefSharp\x64"/>
31+
<file src="..\x64\Release\CefSharp.Core.xml" target="lib"/>
32+
<file src="..\CefSharp\bin\x64\Release\CefSharp.xml" target="CefSharp\x64"/>
33+
<file src="..\CefSharp\bin\x64\Release\CefSharp.xml" target="CefSharp\x86"/>
34+
<!-- Long shot, to see if it's here NuDoq.org looks for it, trial and error at it's best -->
35+
<file src="..\CefSharp\bin\x64\Release\CefSharp.xml" target="lib" />
36+
2937
<file src="CefSharp.Common.props" target="build" />
3038
<file src="CefSharp.Common.targets" target="build" />
3139
</files>

‎NuGet/CefSharp.Common.props‎

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

‎NuGet/CefSharp.Common.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="CefSharpCommonCopyBinaries" BeforeTargets="AfterBuild">
44
<ItemGroup>
5-
<CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\lib\net40\*.*" />
5+
<CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\CefSharp\$(Platform)\*.*" />
66
</ItemGroup>
7-
<Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\lib\net40 to $(TargetDir)" />
7+
<Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\$(Platform) to $(TargetDir)" />
88
<Copy SourceFiles="@(CefSharpBinaries)" DestinationFolder="$(TargetDir)" />
99
</Target>
1010
</Project>

‎NuGet/CefSharp.WinForms.nuspec‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<file src="..\CefSharp.WinForms\bin\x86\Release\CefSharp.WinForms.dll" target="CefSharp\x86" />
2222
<file src="..\CefSharp.WinForms\bin\x64\Release\CefSharp.WinForms.dll" target="CefSharp\x64" />
2323

24+
<file src="..\CefSharp.WinForms\bin\x64\Release\CefSharp.WinForms.xml" target="CefSharp\x86" />
25+
<file src="..\CefSharp.WinForms\bin\x64\Release\CefSharp.WinForms.xml" target="CefSharp\x64" />
26+
<!-- Long shot, to see if it's here NuDoq.org looks for it, trial and error at it's best -->
27+
<file src="..\CefSharp.WinForms\bin\x64\Release\CefSharp.WinForms.xml" target="lib" />
28+
2429
<file src="CefSharp.WinForms.props" target="build" />
2530
</files>
2631
</package>

‎NuGet/CefSharp.Wpf.nuspec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<file src="..\CefSharp.Wpf\bin\x86\Release\CefSharp.Wpf.dll" target="CefSharp\x86" />
2222
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.dll" target="CefSharp\x64" />
2323

24+
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.xml" target="CefSharp\x64" />
25+
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.xml" target="CefSharp\x86" />
26+
<!-- Long shot, to see if it's here NuDoq.org looks for it, trial and error at it's best -->
27+
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.xml" target="lib" />
28+
2429
<file src="CefSharp.Wpf.props" target="build" />
2530
</files>
26-
</package>
31+
</package>

‎NuGet/NuGet.exe‎

1.58 MB
Binary file not shown.

0 commit comments

Comments
 (0)