From 66bb6c0f681072512c804ae1b1d397f20e3acb75 Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Wed, 13 Oct 2021 11:50:00 +1000
Subject: [PATCH] Nuget - Remove netcoreapp3.0 hacks

For those unable to upgrade to .Net Core 3.1 then the old packages should still be usable by specifying AssetTargetFallback as detailed in https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#assettargetfallback

Resolves #3444
---
 NuGet/CefSharp.Common.nuspec    | 26 --------------------------
 NuGet/CefSharp.Common.targets   | 24 ------------------------
 NuGet/CefSharp.OffScreen.nuspec |  3 ---
 NuGet/CefSharp.WinForms.nuspec  |  3 ---
 NuGet/CefSharp.Wpf.nuspec       |  3 ---
 5 files changed, 59 deletions(-)

diff --git a/NuGet/CefSharp.Common.nuspec b/NuGet/CefSharp.Common.nuspec
index c4c268dd67..cfbaca44a8 100644
--- a/NuGet/CefSharp.Common.nuspec
+++ b/NuGet/CefSharp.Common.nuspec
@@ -24,32 +24,6 @@
     <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.xml" target="lib\net452"/>
     <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.pdb" target="lib\net452"/>
     
-    <!-- Net Core Libs -->
-    <!-- These are actually our net452 libs, we just put them in the netcoreapp3 folder for better support -->
-    <file src="..\CefSharp\bin\Release\CefSharp.dll" target="ref\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.dll" target="ref\netcoreapp3.0"/>
-    
-    <file src="..\CefSharp\bin\Release\CefSharp.dll" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp\bin\Release\CefSharp.xml" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp\bin\Release\CefSharp.pdb" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.dll" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.xml" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.pdb" target="runtimes\win-x86\lib\netcoreapp3.0"/> 
-    <file src="..\CefSharp.Core.Runtime\bin\Win32\Release\CefSharp.Core.Runtime.dll" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core.Runtime\bin\Win32\Release\CefSharp.Core.Runtime.xml" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core.Runtime\bin\Win32\Release\CefSharp.Core.Runtime.pdb" target="runtimes\win-x86\lib\netcoreapp3.0"/>
-  
-    <file src="..\CefSharp\bin\Release\CefSharp.dll" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp\bin\Release\CefSharp.xml" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp\bin\Release\CefSharp.pdb" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.dll" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.xml" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core\bin\Release\CefSharp.Core.pdb" target="runtimes\win-x64\lib\netcoreapp3.0"/> 
-    <file src="..\CefSharp.Core.Runtime\bin\x64\Release\CefSharp.Core.Runtime.dll" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core.Runtime\bin\x64\Release\CefSharp.Core.Runtime.xml" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    <file src="..\CefSharp.Core.Runtime\bin\x64\Release\CefSharp.Core.Runtime.pdb" target="runtimes\win-x64\lib\netcoreapp3.0"/>
-    
-    
     <!-- Cannot put these inside lib\net452 etc, since there are both x86 and x64 versions which we must distinguish between. We
          solve this using a .targets file instead to copy them based on PlatformTarget -->
 
diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
index b13edcbfce..4c8e627859 100644
--- a/NuGet/CefSharp.Common.targets
+++ b/NuGet/CefSharp.Common.targets
@@ -147,30 +147,6 @@
   </PropertyGroup>
   
   <Choose>
-    <!--
-    For .Net Core/Net5 when there's no runtime identifier specified then our lib files will be in the runtimes folders
-    we copy our unmanaged resources into the sub folder when required
-    -->
-    <When Condition="'$(RuntimeIdentifier)' == '' AND ($(TargetFramework.StartsWith('netcoreapp3')) OR $(TargetFramework.StartsWith('net5')))">
-      <Choose>
-        <When Condition="'$(CefSharpPlatformTarget)' == 'x64'">
-          <PropertyGroup>
-            <CefSharpTargetDir>runtimes\win-x64\lib\netcoreapp3.0\</CefSharpTargetDir>
-          </PropertyGroup>
-        </When>
-        <When Condition="'$(CefSharpPlatformTarget)' == 'x86'">
-          <PropertyGroup>
-            <CefSharpTargetDir>runtimes\win-x86\lib\netcoreapp3.0\</CefSharpTargetDir>
-          </PropertyGroup>
-        </When>
-        <When Condition="'$(CefSharpPlatformTarget)' == 'AnyCPU'">
-          <PropertyGroup>
-            <CefSharpTargetDirAnyCpu32>runtimes\win-x86\lib\netcoreapp3.0\</CefSharpTargetDirAnyCpu32>
-            <CefSharpTargetDirAnyCpu64>runtimes\win-x64\lib\netcoreapp3.0\</CefSharpTargetDirAnyCpu64>
-          </PropertyGroup>
-        </When>
-      </Choose>   
-    </When>
     <!--
     When CefSharpTargetDir is specified for x86/x64 platforms the files are included in a sub directory, 
     The CefSharp.dll file required by the BrowserSubProcess isn't copied by default and won't start, so we include an extra
diff --git a/NuGet/CefSharp.OffScreen.nuspec b/NuGet/CefSharp.OffScreen.nuspec
index cddd8dd457..97cb5d6ef6 100644
--- a/NuGet/CefSharp.OffScreen.nuspec
+++ b/NuGet/CefSharp.OffScreen.nuspec
@@ -15,9 +15,6 @@
       <group targetFramework=".NETFramework4.5.2">
         <dependency id="CefSharp.Common" version="[$version$]" />
       </group>
-      <group targetFramework=".NETCoreApp3.0">
-        <dependency id="CefSharp.Common" version="[$version$]" />
-      </group>
     </dependencies>
     <releaseNotes>
     <![CDATA[
diff --git a/NuGet/CefSharp.WinForms.nuspec b/NuGet/CefSharp.WinForms.nuspec
index 4c4bd76837..31463cdc6b 100644
--- a/NuGet/CefSharp.WinForms.nuspec
+++ b/NuGet/CefSharp.WinForms.nuspec
@@ -15,9 +15,6 @@
       <group targetFramework=".NETFramework4.5.2">
         <dependency id="CefSharp.Common" version="[$version$]" />
       </group>
-      <group targetFramework=".NETCoreApp3.0">
-        <dependency id="CefSharp.Common" version="[$version$]" />
-      </group>
     </dependencies>
     <releaseNotes>
     <![CDATA[
diff --git a/NuGet/CefSharp.Wpf.nuspec b/NuGet/CefSharp.Wpf.nuspec
index b40c24b5c7..b33f81ca53 100644
--- a/NuGet/CefSharp.Wpf.nuspec
+++ b/NuGet/CefSharp.Wpf.nuspec
@@ -15,9 +15,6 @@
       <group targetFramework=".NETFramework4.5.2">
         <dependency id="CefSharp.Common" version="[$version$]" />
       </group>
-      <group targetFramework=".NETCoreApp3.0">
-        <dependency id="CefSharp.Common" version="[$version$]" />
-      </group>
     </dependencies>
     <releaseNotes>
     <![CDATA[