Skip to content

Commit 08f1ff9

Browse files
committed
Missed reverting some nuget matrix changes
1 parent 72517f1 commit 08f1ff9

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

NuGet/CefSharp.Common.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
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="..\x64\Release\CefSharp.Core.xml" target="CefSharp\x86"/>
29+
<file src="..\Win32\Release\CefSharp.Core.xml" target="CefSharp\x86"/>
3030
<file src="..\x64\Release\CefSharp.Core.xml" target="CefSharp\x64"/>
3131
<file src="..\x64\Release\CefSharp.Core.xml" target="lib"/>
3232
<file src="..\CefSharp\bin\x64\Release\CefSharp.xml" target="CefSharp\x64"/>

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>

0 commit comments

Comments
 (0)