From 3692a86ff434e92452ad4cf4e3dcf0ede43a5f40 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:03:48 -0400 Subject: [PATCH 01/13] Move the CefSharp.Common platform dependendent libraries to the platform specific folders. --- NuGet/CefSharp.Common.targets | 47 +++++------------------------------ 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets index 95c9d915cc..966b61d8e3 100644 --- a/NuGet/CefSharp.Common.targets +++ b/NuGet/CefSharp.Common.targets @@ -1,77 +1,42 @@ - - - - - - . - - - - + - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) + x86\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest Include false - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) + x86\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest Include false - + - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) + x64\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest Include false - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) + x64\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest Include false - - - $(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - From 14c7d4678ab0a2485002da00349272b48362d3db Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:28:49 -0400 Subject: [PATCH 02/13] Copy the CefSharp.OffScreen platform specific libraries to the platform specfic folders. --- NuGet/CefSharp.OffScreen.targets | 62 ++++++++++---------------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets index 58a72c0b88..f06540bcb4 100644 --- a/NuGet/CefSharp.OffScreen.targets +++ b/NuGet/CefSharp.OffScreen.targets @@ -1,53 +1,27 @@ - - . - - - - - - - - $(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + From e7898ab96a866a06bba3f1d966fd7023c99cb763 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:31:09 -0400 Subject: [PATCH 03/13] Copy the CefSharp.WinForms platform specific libraries to the platform specfic folders. --- NuGet/CefSharp.WinForms.targets | 62 ++++++++++----------------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets index 9cfd4c624a..06620f38fb 100644 --- a/NuGet/CefSharp.WinForms.targets +++ b/NuGet/CefSharp.WinForms.targets @@ -1,53 +1,27 @@ - - . - - - - - - - - $(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + From 67c3cc1f3850be391a65dacc863cfb11a81817b1 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:32:03 -0400 Subject: [PATCH 04/13] Copy the CefSharp.Wpf platform specific libraries to the platform specfic folders. --- NuGet/CefSharp.Wpf.targets | 62 +++++++++++--------------------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets index 701fa70c04..a7ced75048 100644 --- a/NuGet/CefSharp.Wpf.targets +++ b/NuGet/CefSharp.Wpf.targets @@ -1,53 +1,27 @@ - - . - - - - - - - - $(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - $(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - - - $(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + From 8e58016474e8fd4437e2c403a0eb33f6e2614d0d Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:42:36 -0400 Subject: [PATCH 05/13] Add app.config transforms for CefSharp.Common to build process. --- .../CefSharp.Common.app.config.x64.transform | 41 +++++++++++++++++++ .../CefSharp.Common.app.config.x86.transform | 41 +++++++++++++++++++ NuGet/CefSharp.Common.nuspec | 2 + NuGet/CefSharp.Common.targets | 7 ++++ 4 files changed, 91 insertions(+) create mode 100644 NuGet/CefSharp.Common.app.config.x64.transform create mode 100644 NuGet/CefSharp.Common.app.config.x86.transform diff --git a/NuGet/CefSharp.Common.app.config.x64.transform b/NuGet/CefSharp.Common.app.config.x64.transform new file mode 100644 index 0000000000..875b837ea4 --- /dev/null +++ b/NuGet/CefSharp.Common.app.config.x64.transform @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet/CefSharp.Common.app.config.x86.transform b/NuGet/CefSharp.Common.app.config.x86.transform new file mode 100644 index 0000000000..628196ae5d --- /dev/null +++ b/NuGet/CefSharp.Common.app.config.x86.transform @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets index 966b61d8e3..0a6654d8fe 100644 --- a/NuGet/CefSharp.Common.targets +++ b/NuGet/CefSharp.Common.targets @@ -39,4 +39,11 @@ + + + + + + + From 37b733f394cde721613bd423f8ebf537ab390ef9 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:43:58 -0400 Subject: [PATCH 06/13] Add app.config transforms for CefSharp.OffScreen to build process. --- ...efSharp.OffScreen.app.config.x64.transform | 23 +++++++++++++++++++ ...efSharp.OffScreen.app.config.x86.transform | 23 +++++++++++++++++++ NuGet/CefSharp.OffScreen.nuspec | 2 ++ NuGet/CefSharp.OffScreen.targets | 8 +++++++ 4 files changed, 56 insertions(+) create mode 100644 NuGet/CefSharp.OffScreen.app.config.x64.transform create mode 100644 NuGet/CefSharp.OffScreen.app.config.x86.transform diff --git a/NuGet/CefSharp.OffScreen.app.config.x64.transform b/NuGet/CefSharp.OffScreen.app.config.x64.transform new file mode 100644 index 0000000000..fa98e3667a --- /dev/null +++ b/NuGet/CefSharp.OffScreen.app.config.x64.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet/CefSharp.OffScreen.app.config.x86.transform b/NuGet/CefSharp.OffScreen.app.config.x86.transform new file mode 100644 index 0000000000..234bc66505 --- /dev/null +++ b/NuGet/CefSharp.OffScreen.app.config.x86.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets index f06540bcb4..01bce7717e 100644 --- a/NuGet/CefSharp.OffScreen.targets +++ b/NuGet/CefSharp.OffScreen.targets @@ -24,4 +24,12 @@ false + + + + + + + + From a3763793d57b41cca77c7a48b956b4324fc196d8 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:45:29 -0400 Subject: [PATCH 07/13] Add app.config transforms for CefSharp.WinForms to build process. --- ...CefSharp.WinForms.app.config.x64.transform | 23 +++++++++++++++++++ ...CefSharp.WinForms.app.config.x86.transform | 23 +++++++++++++++++++ NuGet/CefSharp.WinForms.nuspec | 2 ++ NuGet/CefSharp.WinForms.targets | 8 +++++++ 4 files changed, 56 insertions(+) create mode 100644 NuGet/CefSharp.WinForms.app.config.x64.transform create mode 100644 NuGet/CefSharp.WinForms.app.config.x86.transform diff --git a/NuGet/CefSharp.WinForms.app.config.x64.transform b/NuGet/CefSharp.WinForms.app.config.x64.transform new file mode 100644 index 0000000000..15ddd47bf6 --- /dev/null +++ b/NuGet/CefSharp.WinForms.app.config.x64.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet/CefSharp.WinForms.app.config.x86.transform b/NuGet/CefSharp.WinForms.app.config.x86.transform new file mode 100644 index 0000000000..64b407ef86 --- /dev/null +++ b/NuGet/CefSharp.WinForms.app.config.x86.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets index 06620f38fb..99e8026853 100644 --- a/NuGet/CefSharp.WinForms.targets +++ b/NuGet/CefSharp.WinForms.targets @@ -24,4 +24,12 @@ false + + + + + + + + From e0e32bfa6704cb65d8c1c000b92561d6cef7e616 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:47:01 -0400 Subject: [PATCH 08/13] Add app.config transforms for CefSharp.Wpf to build process. --- NuGet/CefSharp.Wpf.app.config.x64.transform | 23 +++++++++++++++++++++ NuGet/CefSharp.Wpf.app.config.x86.transform | 23 +++++++++++++++++++++ NuGet/CefSharp.Wpf.nuspec | 2 ++ NuGet/CefSharp.Wpf.targets | 8 +++++++ 4 files changed, 56 insertions(+) create mode 100644 NuGet/CefSharp.Wpf.app.config.x64.transform create mode 100644 NuGet/CefSharp.Wpf.app.config.x86.transform diff --git a/NuGet/CefSharp.Wpf.app.config.x64.transform b/NuGet/CefSharp.Wpf.app.config.x64.transform new file mode 100644 index 0000000000..60ce6a8403 --- /dev/null +++ b/NuGet/CefSharp.Wpf.app.config.x64.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet/CefSharp.Wpf.app.config.x86.transform b/NuGet/CefSharp.Wpf.app.config.x86.transform new file mode 100644 index 0000000000..2ef30b2112 --- /dev/null +++ b/NuGet/CefSharp.Wpf.app.config.x86.transform @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets index a7ced75048..d7130cddf3 100644 --- a/NuGet/CefSharp.Wpf.targets +++ b/NuGet/CefSharp.Wpf.targets @@ -24,4 +24,12 @@ false + + + + + + + + From 8eeec8bf816afa76812a120c5cac9a346973c393 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:47:47 -0400 Subject: [PATCH 09/13] Update CefSharp build script to set versions in app.config transform files. --- build.ps1 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) 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" From a14711a24c8b48fd191737b4545a37dc00c2adfc Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 6 Jul 2020 13:48:39 -0400 Subject: [PATCH 10/13] Add missing NuGet transform and target files to the CefSharp solution. --- CefSharp3.sln | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 From 66d95f54beea1449517792433672d480946d9bc0 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Wed, 8 Jul 2020 12:34:27 -0400 Subject: [PATCH 11/13] Do not attempt to remove non-existant dependentAssembly sections. --- .../CefSharp.Common.app.config.x64.transform | 32 +++++++++++++------ .../CefSharp.Common.app.config.x86.transform | 32 +++++++++++++------ ...efSharp.OffScreen.app.config.x64.transform | 12 ++++--- ...efSharp.OffScreen.app.config.x86.transform | 12 ++++--- ...CefSharp.WinForms.app.config.x64.transform | 12 ++++--- ...CefSharp.WinForms.app.config.x86.transform | 12 ++++--- NuGet/CefSharp.Wpf.app.config.x64.transform | 12 ++++--- NuGet/CefSharp.Wpf.app.config.x86.transform | 12 ++++--- 8 files changed, 92 insertions(+), 44 deletions(-) diff --git a/NuGet/CefSharp.Common.app.config.x64.transform b/NuGet/CefSharp.Common.app.config.x64.transform index 875b837ea4..0523471494 100644 --- a/NuGet/CefSharp.Common.app.config.x64.transform +++ b/NuGet/CefSharp.Common.app.config.x64.transform @@ -10,31 +10,43 @@ - - - - - - + + + + + + + - - - + + + + + + + - + + + + + + + + diff --git a/NuGet/CefSharp.Common.app.config.x86.transform b/NuGet/CefSharp.Common.app.config.x86.transform index 628196ae5d..aae29d53dd 100644 --- a/NuGet/CefSharp.Common.app.config.x86.transform +++ b/NuGet/CefSharp.Common.app.config.x86.transform @@ -10,31 +10,43 @@ - - - - - - + + + + + + + - - - + + + + + + + - + + + + + + + + diff --git a/NuGet/CefSharp.OffScreen.app.config.x64.transform b/NuGet/CefSharp.OffScreen.app.config.x64.transform index fa98e3667a..924e3f118a 100644 --- a/NuGet/CefSharp.OffScreen.app.config.x64.transform +++ b/NuGet/CefSharp.OffScreen.app.config.x64.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + diff --git a/NuGet/CefSharp.OffScreen.app.config.x86.transform b/NuGet/CefSharp.OffScreen.app.config.x86.transform index 234bc66505..89103a4bfb 100644 --- a/NuGet/CefSharp.OffScreen.app.config.x86.transform +++ b/NuGet/CefSharp.OffScreen.app.config.x86.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + diff --git a/NuGet/CefSharp.WinForms.app.config.x64.transform b/NuGet/CefSharp.WinForms.app.config.x64.transform index 15ddd47bf6..9b51f9ec21 100644 --- a/NuGet/CefSharp.WinForms.app.config.x64.transform +++ b/NuGet/CefSharp.WinForms.app.config.x64.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + diff --git a/NuGet/CefSharp.WinForms.app.config.x86.transform b/NuGet/CefSharp.WinForms.app.config.x86.transform index 64b407ef86..dd2f0fc140 100644 --- a/NuGet/CefSharp.WinForms.app.config.x86.transform +++ b/NuGet/CefSharp.WinForms.app.config.x86.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + diff --git a/NuGet/CefSharp.Wpf.app.config.x64.transform b/NuGet/CefSharp.Wpf.app.config.x64.transform index 60ce6a8403..344d687b6c 100644 --- a/NuGet/CefSharp.Wpf.app.config.x64.transform +++ b/NuGet/CefSharp.Wpf.app.config.x64.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + diff --git a/NuGet/CefSharp.Wpf.app.config.x86.transform b/NuGet/CefSharp.Wpf.app.config.x86.transform index 2ef30b2112..0beedfd7d2 100644 --- a/NuGet/CefSharp.Wpf.app.config.x86.transform +++ b/NuGet/CefSharp.Wpf.app.config.x86.transform @@ -10,13 +10,17 @@ - - - - + + + + + + + + From 582b342081ae511530334342e9c4a04f950c9feb Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Fri, 10 Jul 2020 12:21:17 -0400 Subject: [PATCH 12/13] Use correct processorArhitecture for x64 platflorms. See https://docs.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/runtime/assemblyidentity-element-for-runtime#processorarchitecture-attribute for complete list. --- NuGet/CefSharp.Common.app.config.x64.transform | 18 +++++++++--------- ...CefSharp.OffScreen.app.config.x64.transform | 6 +++--- .../CefSharp.WinForms.app.config.x64.transform | 6 +++--- NuGet/CefSharp.Wpf.app.config.x64.transform | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet/CefSharp.Common.app.config.x64.transform b/NuGet/CefSharp.Common.app.config.x64.transform index 0523471494..fc03b7a548 100644 --- a/NuGet/CefSharp.Common.app.config.x64.transform +++ b/NuGet/CefSharp.Common.app.config.x64.transform @@ -11,12 +11,12 @@ - - + + - + @@ -24,12 +24,12 @@ - - + + - + @@ -37,12 +37,12 @@ - - + + - + diff --git a/NuGet/CefSharp.OffScreen.app.config.x64.transform b/NuGet/CefSharp.OffScreen.app.config.x64.transform index 924e3f118a..4bcd4ce565 100644 --- a/NuGet/CefSharp.OffScreen.app.config.x64.transform +++ b/NuGet/CefSharp.OffScreen.app.config.x64.transform @@ -11,12 +11,12 @@ - - + + - + diff --git a/NuGet/CefSharp.WinForms.app.config.x64.transform b/NuGet/CefSharp.WinForms.app.config.x64.transform index 9b51f9ec21..ca5c385a77 100644 --- a/NuGet/CefSharp.WinForms.app.config.x64.transform +++ b/NuGet/CefSharp.WinForms.app.config.x64.transform @@ -11,12 +11,12 @@ - - + + - + diff --git a/NuGet/CefSharp.Wpf.app.config.x64.transform b/NuGet/CefSharp.Wpf.app.config.x64.transform index 344d687b6c..18fc2dcd7b 100644 --- a/NuGet/CefSharp.Wpf.app.config.x64.transform +++ b/NuGet/CefSharp.Wpf.app.config.x64.transform @@ -11,12 +11,12 @@ - - + + - + From 3c64bf6d41266289424af87cffc59f94e2f960ce Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Mon, 13 Jul 2020 12:53:12 -0400 Subject: [PATCH 13/13] Use Choose instead of ItemGroup to conditionally include files. --- NuGet/CefSharp.Common.targets | 66 ++++++++++++++++++-------------- NuGet/CefSharp.OffScreen.targets | 40 +++++++++++-------- NuGet/CefSharp.WinForms.targets | 40 +++++++++++-------- NuGet/CefSharp.Wpf.targets | 40 +++++++++++-------- 4 files changed, 109 insertions(+), 77 deletions(-) diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets index 0a6654d8fe..eb867999d1 100644 --- a/NuGet/CefSharp.Common.targets +++ b/NuGet/CefSharp.Common.targets @@ -9,36 +9,44 @@ correct ordering .props imports, which we require as this depends on the cef.redist packages exporting an ItemGroup --> - - - x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - - - - x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - - x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + + diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets index 01bce7717e..db09cf3a33 100644 --- a/NuGet/CefSharp.OffScreen.targets +++ b/NuGet/CefSharp.OffScreen.targets @@ -7,23 +7,31 @@ --> - - - x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + - - - x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets index 99e8026853..733488c5d4 100644 --- a/NuGet/CefSharp.WinForms.targets +++ b/NuGet/CefSharp.WinForms.targets @@ -7,23 +7,31 @@ --> - - - x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + - - - x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets index d7130cddf3..7b894eb5ed 100644 --- a/NuGet/CefSharp.Wpf.targets +++ b/NuGet/CefSharp.Wpf.targets @@ -7,23 +7,31 @@ --> - - - x86\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x86\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + + - - - x64\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - Include - false - - + + + + + x64\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Include + false + + + +