Revert to simply style Nuget for now - will readdress after releases have been done

Author: amaitland

NuGet/CefSharp.Common.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>CefSharp.Common$DotPlatform$</id>
+    <id>CefSharp.Common</id>
     <version>$version$</version>
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
@@ -17,12 +17,17 @@
 </metadata>
   <files>
     <!-- Common CefSharp stuff (shared between both WPF and WinForms) -->
-    <file src="..\$CPlatform$\Release\CefSharp.Core.dll" target="lib\net40"/>
-    <file src="..\CefSharp\bin\$Platform$\Release\CefSharp.dll" target="lib\net40"/>
-    <file src="..\CefSharp.BrowserSubprocess\bin\$Platform$\Release\CefSharp.BrowserSubprocess.Core.dll" target="lib\net40"/>
-	<file src="..\CefSharp.BrowserSubprocess\bin\$Platform$\Release\CefSharp.BrowserSubprocess.exe" target="lib\net40"/>
+    <file src="..\Win32\Release\CefSharp.Core.dll" target="CefSharp\x86"/>
+    <file src="..\x64\Release\CefSharp.Core.dll" target="CefSharp\x64"/>
+    <file src="..\CefSharp\bin\x86\Release\CefSharp.dll" target="CefSharp\x86"/>
+    <file src="..\CefSharp\bin\x64\Release\CefSharp.dll" target="CefSharp\x64"/>
+	<file src="..\CefSharp.BrowserSubprocess\bin\x86\Release\CefSharp.BrowserSubprocess.Core.dll" target="CefSharp\x86"/>
+    <file src="..\CefSharp.BrowserSubprocess\bin\x86\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x86"/>
+    <file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.Core.dll" target="CefSharp\x64"/>
+	<file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x64"/>
 
-    <file src="CefSharp.Common.props" target="build\" />
-    <file src="CefSharp.Common.targets" target="build\" />
+    <file src="CefSharp.Common.props" target="build" />
+    <file src="CefSharp.Common.targets" target="build" />
   </files>
 </package>
+

NuGet/CefSharp.WpfOrWinForms.nuspec renamed to NuGet/CefSharp.Wpf.nuspec

@@ -1,22 +1,26 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>CefSharp.$ControlType$$DotPlatform$</id>
+    <id>CefSharp.Wpf</id>
     <version>$version$</version>
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
     <projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
     <licenseUrl>https://raw.github.com/cefsharp/CefSharp/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>The CefSharp Chromium-based browser component ($ControlType$ control).</description>
-    <tags>$ControlType$ chrome browser</tags>
+    <description>The CefSharp Chromium-based browser component (WPF control).</description>
+    <tags>wpf chrome browser</tags>
     <copyright>Copyright © 2010-2014 The CefSharp Authors</copyright>
     <dependencies>
-      <dependency id="CefSharp.Common$DotPlatform$" version="[$version$]" />
+      <dependency id="CefSharp.Common" version="[$version$]" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\CefSharp.$ControlType$\bin\$Platform$\Release\CefSharp.$ControlType$.dll" target="lib\net40" />
-    <file src="CefSharp.$ControlType$.props" target="build\" />
+    <!-- Cannot put these inside lib\net40 etc, since there are both x86 and x64 versions which we must distinguish between. We
+         solve this using a .props file instead. -->
+    <file src="..\CefSharp.Wpf\bin\x86\Release\CefSharp.Wpf.dll" target="CefSharp\x86" />
+    <file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.dll" target="CefSharp\x64" />
+
+    <file src="CefSharp.Wpf.props" target="build" />
   </files>
-</package>
+</package>

NuGet/CefSharp.Wpf.props

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Reference Include="$(MSBuildThisFileDirectory)..\lib\net40\CefSharp.Wpf.dll" />
+    <Reference Condition="'$(Platform)' == 'x86'"
+             Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll" />
+
+    <Reference Condition="'$(Platform)' == 'x64'"
+               Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll" />
   </ItemGroup>
 </Project>