Skip to content

Commit

Permalink
Nuget - Remove netcoreapp3.0 hacks
Browse files Browse the repository at this point in the history
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 cefsharp#3444
  • Loading branch information
amaitland committed Oct 13, 2021
1 parent 42e7b90 commit 66bb6c0
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 59 deletions.
26 changes: 0 additions & 26 deletions NuGet/CefSharp.Common.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->

Expand Down
24 changes: 0 additions & 24 deletions NuGet/CefSharp.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions NuGet/CefSharp.OffScreen.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down
3 changes: 0 additions & 3 deletions NuGet/CefSharp.WinForms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down
3 changes: 0 additions & 3 deletions NuGet/CefSharp.Wpf.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down

0 comments on commit 66bb6c0

Please sign in to comment.