Merge remote-tracking branch 'remotes/upstream/master' into fix/jsb-memoryleak

Author: amaitland

NuGet/CefSharp.Common.props

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

NuGet/CefSharp.OffScreen.props

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

NuGet/CefSharp.WinForms.props

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

NuGet/CefSharp.Wpf.props

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