From 715b5e7336c4585e5ff2522b671370b03b7506ea Mon Sep 17 00:00:00 2001
From: David Ellingsworth <David.Ellingsworth@davey.com>
Date: Thu, 2 Jul 2020 15:28:11 -0400
Subject: [PATCH] Move platform dependent files to respective directories. Use
 XML transforms to update the app.config during build.

---
 CefSharp3.sln                                 | 11 +++
 .../CefSharp.Common.app.config.x64.transform  | 30 ++++++++
 .../CefSharp.Common.app.config.x86.transform  | 30 ++++++++
 NuGet/CefSharp.Common.nuspec                  |  2 +
 NuGet/CefSharp.Common.targets                 | 56 ++++-----------
 ...efSharp.OffScreen.app.config.x64.transform |  0
 ...efSharp.OffScreen.app.config.x86.transform |  0
 NuGet/CefSharp.OffScreen.nuspec               |  2 +
 NuGet/CefSharp.OffScreen.targets              | 68 +++++++------------
 ...CefSharp.WinForms.app.config.x64.transform | 18 +++++
 ...CefSharp.WinForms.app.config.x86.transform | 18 +++++
 NuGet/CefSharp.WinForms.nuspec                |  2 +
 NuGet/CefSharp.WinForms.targets               | 68 +++++++------------
 NuGet/CefSharp.Wpf.app.config.x64.transform   | 18 +++++
 NuGet/CefSharp.Wpf.app.config.x86.transform   | 18 +++++
 NuGet/CefSharp.Wpf.nuspec                     |  2 +
 NuGet/CefSharp.Wpf.targets                    | 68 +++++++------------
 build.ps1                                     | 21 ++++++
 18 files changed, 261 insertions(+), 171 deletions(-)
 create mode 100644 NuGet/CefSharp.Common.app.config.x64.transform
 create mode 100644 NuGet/CefSharp.Common.app.config.x86.transform
 create mode 100644 NuGet/CefSharp.OffScreen.app.config.x64.transform
 create mode 100644 NuGet/CefSharp.OffScreen.app.config.x86.transform
 create mode 100644 NuGet/CefSharp.WinForms.app.config.x64.transform
 create mode 100644 NuGet/CefSharp.WinForms.app.config.x86.transform
 create mode 100644 NuGet/CefSharp.Wpf.app.config.x64.transform
 create mode 100644 NuGet/CefSharp.Wpf.app.config.x86.transform

diff --git a/CefSharp3.sln b/CefSharp3.sln
index 3469e0ec43..4a0cc42ca3 100644
--- a/CefSharp3.sln
+++ b/CefSharp3.sln
@@ -42,15 +42,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms.Example",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{A23AA466-1903-44F2-946D-25AD0500D56B}"
 	ProjectSection(SolutionItems) = preProject
+		NuGet\CefSharp.Common.app.config.x64.transform = NuGet\CefSharp.Common.app.config.x64.transform
+		NuGet\CefSharp.Common.app.config.x86.transform = NuGet\CefSharp.Common.app.config.x86.transform
 		NuGet\CefSharp.Common.nuspec = NuGet\CefSharp.Common.nuspec
 		NuGet\CefSharp.Common.props = NuGet\CefSharp.Common.props
 		NuGet\CefSharp.Common.targets = NuGet\CefSharp.Common.targets
+		NuGet\CefSharp.OffScreen.app.config.x64.transform = NuGet\CefSharp.OffScreen.app.config.x64.transform
+		NuGet\CefSharp.OffScreen.app.config.x86.transform = NuGet\CefSharp.OffScreen.app.config.x86.transform
 		NuGet\CefSharp.OffScreen.nuspec = NuGet\CefSharp.OffScreen.nuspec
 		NuGet\CefSharp.OffScreen.props = NuGet\CefSharp.OffScreen.props
+		NuGet\CefSharp.OffScreen.targets = NuGet\CefSharp.OffScreen.targets
+		NuGet\CefSharp.WinForms.app.config.x64.transform = NuGet\CefSharp.WinForms.app.config.x64.transform
+		NuGet\CefSharp.WinForms.app.config.x86.transform = NuGet\CefSharp.WinForms.app.config.x86.transform
 		NuGet\CefSharp.WinForms.nuspec = NuGet\CefSharp.WinForms.nuspec
 		NuGet\CefSharp.WinForms.props = NuGet\CefSharp.WinForms.props
+		NuGet\CefSharp.WinForms.targets = NuGet\CefSharp.WinForms.targets
+		NuGet\CefSharp.Wpf.app.config.x64.transform = NuGet\CefSharp.Wpf.app.config.x64.transform
+		NuGet\CefSharp.Wpf.app.config.x86.transform = NuGet\CefSharp.Wpf.app.config.x86.transform
 		NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
 		NuGet\CefSharp.Wpf.props = NuGet\CefSharp.Wpf.props
+		NuGet\CefSharp.Wpf.targets = NuGet\CefSharp.Wpf.targets
 		NuGet\Readme.txt = NuGet\Readme.txt
 	EndProjectSection
 EndProject
diff --git a/NuGet/CefSharp.Common.app.config.x64.transform b/NuGet/CefSharp.Common.app.config.x64.transform
new file mode 100644
index 0000000000..14638ff3e5
--- /dev/null
+++ b/NuGet/CefSharp.Common.app.config.x64.transform
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Core')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Core')">
+                <assemblyIdentity name="CefSharp.Core" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x64/CefSharp.Core.dll"/>
+            </dependentAssembly>
+            
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp')">
+                <assemblyIdentity name="CefSharp" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x64/CefSharp.dll"/>
+            </dependentAssembly>
+            
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')">
+                <assemblyIdentity name="CefSharp.BrowserSubprocess.Core" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x64/CefSharp.BrowserSubprocess.Core.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.Common.app.config.x86.transform b/NuGet/CefSharp.Common.app.config.x86.transform
new file mode 100644
index 0000000000..b95bbe2598
--- /dev/null
+++ b/NuGet/CefSharp.Common.app.config.x86.transform
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Core')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Core')">
+                <assemblyIdentity name="CefSharp.Core" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x86/CefSharp.Core.dll"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp')">
+                <assemblyIdentity name="CefSharp" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x86/CefSharp.dll"/>
+            </dependentAssembly>
+            
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.BrowserSubprocess.Core')">
+                <assemblyIdentity name="CefSharp.BrowserSubprocess.Core" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x86/CefSharp.BrowserSubprocess.Core.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.Common.nuspec b/NuGet/CefSharp.Common.nuspec
index df8826e48c..f83624180f 100644
--- a/NuGet/CefSharp.Common.nuspec
+++ b/NuGet/CefSharp.Common.nuspec
@@ -49,6 +49,8 @@
 
     <file src="CefSharp.Common.props" target="build" />
     <file src="CefSharp.Common.targets" target="build" />
+    <file src="CefSharp.Common.app.config.x86.transform" target="build\app.config.x86.transform" />
+    <file src="CefSharp.Common.app.config.x64.transform" target="build\app.config.x64.transform" />
   
     <file src="..\CefSharp\**\*.cs" target="src\CefSharp" />
     <file src="..\CefSharp.Core\**\*.h" target="src\CefSharp.Core" />
diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
index 95c9d915cc..cd032b28bc 100644
--- a/NuGet/CefSharp.Common.targets
+++ b/NuGet/CefSharp.Common.targets
@@ -1,77 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="PlatformCheck" BeforeTargets="ResolveAssemblyReferences" Condition="(('$(Platform)' != 'x86') AND ('$(Platform)' != 'x64') AND ('$(Platform)' != 'Win32') AND '$(CefSharpAnyCpuSupport)' != 'true')">
-    <Error Text="$(MSBuildThisFileName) is unable to proceeed as your current Platform is '$(Platform)'. To target AnyCPU please read https://github.com/cefsharp/CefSharp/issues/1714. Alternatively change your Platform to x86 or x64 and the relevant files will be copied automatically. For details on changing your projects Platform see https://docs.microsoft.com/en-gb/visualstudio/ide/how-to-configure-projects-to-target-platforms?view=vs-2017" HelpKeyword="CefSharpSolutionPlatformCheck" />
-  </Target>
-
   <Target Name="FrameworkVersionCheck" BeforeTargets="ResolveAssemblyReferences" Condition="(('$(TargetFrameworkVersion)' == 'v4.5.1') OR ('$(TargetFrameworkVersion)' == 'v4.5') OR ('$(TargetFrameworkVersion)' == 'v4.0'))">
     <Error Text="CefSharp requires .Net 4.5.2 or higher" />
   </Target>
 
-  <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir>
-  </PropertyGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
     exporting an ItemGroup
    -->
-
-  <ItemGroup Condition="('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
     <None Include="@(CefRedist32)">
-      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PublishState>Include</PublishState>
       <Visible>false</Visible>
     </None>
     <None Include="@(CefSharpCommonBinaries32)">
-      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PublishState>Include</PublishState>
       <Visible>false</Visible>
     </None>
   </ItemGroup>
-
-  <ItemGroup Condition="'$(Platform)' == 'x64'">
+  
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')">
     <None Include="@(CefRedist64)">
-      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PublishState>Include</PublishState>
       <Visible>false</Visible>
     </None>
     <None Include="@(CefSharpCommonBinaries64)">
-      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <PublishState>Include</PublishState>
       <Visible>false</Visible>
     </None>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
-    <None Include="@(CefRedist32)">
-      <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PublishState>Include</PublishState>
-      <Visible>false</Visible>
-    </None>
-    <None Include="@(CefRedist64)">
-      <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PublishState>Include</PublishState>
-      <Visible>false</Visible>
-    </None>
-    <None Include="@(CefSharpCommonBinaries32)">
-      <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PublishState>Include</PublishState>
-      <Visible>false</Visible>
-    </None>
-    <None Include="@(CefSharpCommonBinaries64)">
-      <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PublishState>Include</PublishState>
-      <Visible>false</Visible>
-    </None>
-  </ItemGroup>
+  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
+  <Target Name="CefSharpCommon_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
+  <Target Name="CefSharpCommon_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
 </Project>
diff --git a/NuGet/CefSharp.OffScreen.app.config.x64.transform b/NuGet/CefSharp.OffScreen.app.config.x64.transform
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/NuGet/CefSharp.OffScreen.app.config.x86.transform b/NuGet/CefSharp.OffScreen.app.config.x86.transform
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/NuGet/CefSharp.OffScreen.nuspec b/NuGet/CefSharp.OffScreen.nuspec
index 5719d7f412..215086c59c 100644
--- a/NuGet/CefSharp.OffScreen.nuspec
+++ b/NuGet/CefSharp.OffScreen.nuspec
@@ -39,6 +39,8 @@
 
     <file src="CefSharp.OffScreen.props" target="build" />
     <file src="CefSharp.OffScreen.targets" target="build" />
+    <file src="CefSharp.OffScreen.app.config.x64.transform" target="build\app.config.x64.transform" />
+    <file src="CefSharp.OffScreen.app.config.x86.transform" target="build\app.config.x86.transform" />
 
     <file src="Readme.txt" target="" />
 
diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets
index 58a72c0b88..7f87bf8606 100644
--- a/NuGet/CefSharp.OffScreen.targets
+++ b/NuGet/CefSharp.OffScreen.targets
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir>
-  </PropertyGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
@@ -11,43 +7,29 @@
    -->
 
   <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
-  <Choose>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
-      <ItemGroup>
-        <None Include="@(CefSharpOffScreenBinaries32)">
-          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-        <None Include="@(CefSharpOffScreenBinaries64)">
-          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <When Condition="'$(Platform)' == 'x64'">
-      <ItemGroup>
-        <None Include="@(CefSharpOffScreenBinaries64)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <!-- x86, and Win32 -->
-    <Otherwise>
-      <ItemGroup>
-        <None Include="@(CefSharpOffScreenBinaries32)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
+    <None Include="@(CefSharpOffScreenBinaries32)">
+      <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+  
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')">
+    <None Include="@(CefSharpOffScreenBinaries64)">
+      <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+
+  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
+  <Target Name="CefSharpOffScreen_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
+  <Target Name="CefSharpOffScreen_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
 </Project>
diff --git a/NuGet/CefSharp.WinForms.app.config.x64.transform b/NuGet/CefSharp.WinForms.app.config.x64.transform
new file mode 100644
index 0000000000..aaffc08c27
--- /dev/null
+++ b/NuGet/CefSharp.WinForms.app.config.x64.transform
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')">
+                <assemblyIdentity name="CefSharp.WinForms" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x64/CefSharp.WinForms.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.WinForms.app.config.x86.transform b/NuGet/CefSharp.WinForms.app.config.x86.transform
new file mode 100644
index 0000000000..80457c2c71
--- /dev/null
+++ b/NuGet/CefSharp.WinForms.app.config.x86.transform
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.WinForms')">
+                <assemblyIdentity name="CefSharp.WinForms" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x86/CefSharp.WinForms.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.WinForms.nuspec b/NuGet/CefSharp.WinForms.nuspec
index 454b4796c6..79f3485768 100644
--- a/NuGet/CefSharp.WinForms.nuspec
+++ b/NuGet/CefSharp.WinForms.nuspec
@@ -39,6 +39,8 @@
 
     <file src="CefSharp.WinForms.props" target="build" />
     <file src="CefSharp.WinForms.targets" target="build" />
+    <file src="CefSharp.WinForms.app.config.x64.transform" target="build/app.config.x64.transform" />
+    <file src="CefSharp.WinForms.app.config.x86.transform" target="build/app.config.x86.transform" />
 
     <file src="Readme.txt" target="" />
 
diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets
index 9cfd4c624a..bfc3706f65 100644
--- a/NuGet/CefSharp.WinForms.targets
+++ b/NuGet/CefSharp.WinForms.targets
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir>
-  </PropertyGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
@@ -11,43 +7,29 @@
    -->
 
   <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
-  <Choose>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
-      <ItemGroup>
-        <None Include="@(CefSharpWinFormsBinaries32)">
-          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-        <None Include="@(CefSharpWinFormsBinaries64)">
-          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <When Condition="'$(Platform)' == 'x64'">
-      <ItemGroup>
-        <None Include="@(CefSharpWinFormsBinaries64)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <!-- x86, and Win32 -->
-    <Otherwise>
-      <ItemGroup>
-        <None Include="@(CefSharpWinFormsBinaries32)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
+    <None Include="@(CefSharpWinFormsBinaries32)">
+      <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+  
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')">
+    <None Include="@(CefSharpWinFormsBinaries64)">
+      <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Include</PublishState>
+		  <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+
+  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
+  <Target Name="CefSharpWinForms_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
+  <Target Name="CefSharpWinForms_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
 </Project>
diff --git a/NuGet/CefSharp.Wpf.app.config.x64.transform b/NuGet/CefSharp.Wpf.app.config.x64.transform
new file mode 100644
index 0000000000..5e1dc244df
--- /dev/null
+++ b/NuGet/CefSharp.Wpf.app.config.x64.transform
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Wpf')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x64' and asmv1:assemblyIdentity/@name='CefSharp.Wpf')">
+                <assemblyIdentity name="CefSharp.Wpf" processorArchitecture="x64" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x64/CefSharp.Wpf.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.Wpf.app.config.x86.transform b/NuGet/CefSharp.Wpf.app.config.x86.transform
new file mode 100644
index 0000000000..627aef5b94
--- /dev/null
+++ b/NuGet/CefSharp.Wpf.app.config.x86.transform
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1">
+    <runtime xdt:Transform="InsertIfMissing"/>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing"/>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Wpf')"/>
+            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(asmv1:assemblyIdentity/@processorArchitecture='x86' and asmv1:assemblyIdentity/@name='CefSharp.Wpf')">
+                <assemblyIdentity name="CefSharp.Wpf" processorArchitecture="x86" publicKeyToken="40c4b6fc221f4138" culture="neutral"/>
+                <codeBase version="83.4.2.0" href="x86/CefSharp.Wpf.dll"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/NuGet/CefSharp.Wpf.nuspec b/NuGet/CefSharp.Wpf.nuspec
index 5f230b32ed..3b1630a4c6 100644
--- a/NuGet/CefSharp.Wpf.nuspec
+++ b/NuGet/CefSharp.Wpf.nuspec
@@ -39,6 +39,8 @@
 
     <file src="CefSharp.Wpf.props" target="build" />
     <file src="CefSharp.Wpf.targets" target="build" />
+    <file src="CefSharp.Wpf.app.config.x64.transform" target="build\app.config.x64.transform" />
+    <file src="CefSharp.Wpf.app.config.x86.transform" target="build\app.config.x86.transform" />
 
     <file src="Readme.txt" target="" />
 
diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets
index 701fa70c04..5a4820b414 100644
--- a/NuGet/CefSharp.Wpf.targets
+++ b/NuGet/CefSharp.Wpf.targets
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">.</CefSharpTargetDir>
-  </PropertyGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
@@ -11,43 +7,29 @@
    -->
 
   <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
-  <Choose>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
-      <ItemGroup>
-        <None Include="@(CefSharpWpfBinaries32)">
-          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-        <None Include="@(CefSharpWpfBinaries64)">
-          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <When Condition="'$(Platform)' == 'x64'">
-      <ItemGroup>
-        <None Include="@(CefSharpWpfBinaries64)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </When>
-    <!-- x86, and Win32 -->
-    <Otherwise>
-      <ItemGroup>
-        <None Include="@(CefSharpWpfBinaries32)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <PublishState>Include</PublishState>
-          <Visible>false</Visible>
-        </None>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
+    <None Include="@(CefSharpWpfBinaries32)">
+      <Link>x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+  
+  <ItemGroup Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')">
+    <None Include="@(CefSharpWpfBinaries64)">
+      <Link>x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+
+  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
+  <Target Name="CefSharpWpf_TransformX86Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x86.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
+  <Target Name="CefSharpWpf_TransformX64Config" Condition="('$(Platform)' == 'AnyCPU') OR ('$(Platform)' == 'x64')" AfterTargets="_CopyAppConfigFile">
+    <TransformXml Source="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')" Transform="$(MSBuildThisFileDirectory)app.config.x64.transform" Destination="@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')"/>
+  </Target>
 </Project>
diff --git a/build.ps1 b/build.ps1
index 6cffe298d1..10828f6d1f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -381,6 +381,18 @@ function WriteVersionToManifest($manifest)
     [System.IO.File]::WriteAllLines($Filename, $NewString, $Utf8NoBomEncoding)
 }
 
+function WriteVersionToTransform($transform)
+{
+    $Filename = Join-Path $WorkingDir $transform
+    $Regex = 'codeBase version="(.*?)"';
+
+    $TransformData = Get-Content -Encoding UTF8 $Filename
+    $NewString = $TransformData -replace $Regex, "codeBase version=""$AssemblyVersion.0"""
+
+    $Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
+    [System.IO.File]::WriteAllLines($Filename, $NewString, $Utf8NoBomEncoding)
+}
+
 function WriteVersionToResourceFile($resourceFile)
 {
     $Filename = Join-Path $WorkingDir $resourceFile
@@ -445,6 +457,15 @@ WriteVersionToManifest "CefSharp.Wpf.Example\app.manifest"
 WriteVersionToResourceFile "CefSharp.BrowserSubprocess.Core\Resource.rc"
 WriteVersionToResourceFile "CefSharp.Core\Resource.rc"
 
+WriteVersionToTransform "NuGet\CefSharp.Common.app.config.x64.transform"
+WriteVersionToTransform "NuGet\CefSharp.Common.app.config.x86.transform"
+WriteVersionToTransform "NuGet\CefSharp.OffScreen.app.config.x64.transform"
+WriteVersionToTransform "nuget\CefSharp.OffScreen.app.config.x86.transform"
+WriteVersionToTransform "NuGet\CefSharp.WinForms.app.config.x64.transform"
+WriteVersionToTransform "NuGet\CefSharp.WinForms.app.config.x86.transform"
+WriteVersionToTransform "NuGet\CefSharp.Wpf.app.config.x64.transform"
+WriteVersionToTransform "NuGet\CefSharp.Wpf.app.config.x86.transform"
+
 switch -Exact ($Target)
 {
     "nupkg-only"