Skip to content

Commit 56959e9

Browse files
amaitlandamaitland
committed
Net Core - Remove CefSharp.BrowserSubprocess.runtimeconfig.json when SelfContained
- Previous fix worked for .Net Core 3.1, the .Net 5.0 SDK handles things differently Have to remove the runtimeconfig.json file when publishing so the BrowserSubprocess Runs for the SelfContained framework - Fix formatting
1 parent 14291d1 commit 56959e9

File tree

1 file changed

+112
-90
lines changed

1 file changed

+112
-90
lines changed

‎NuGet/PackageReference/CefSharp.Common.NETCore.targets‎

Lines changed: 112 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<_CefSharpBrowserSubProcessRuntimeConfig>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.runtimeconfig.json'))</_CefSharpBrowserSubProcessRuntimeConfig>
5+
</PropertyGroup>
6+
37
<!--
48
For SelfContained and PublishSingleFile we remove the CefSharp.BrowserSubprocess.runtimeconfig.json file so
59
the BrowserSubprocess runs using the packages .net runtime
610
Issue https://github.com/cefsharp/CefSharp/issues/3407
711
-->
812
<Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterResolveAssemblyReferences" AfterTargets="ResolveAssemblyReferences" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
9-
<PropertyGroup>
10-
<_CefSharpBrowserSubProcessRuntimeConfig>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.runtimeconfig.json'))</_CefSharpBrowserSubProcessRuntimeConfig>
11-
</PropertyGroup>
12-
<ItemGroup>
13-
<ReferenceCopyLocalPaths Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
13+
<ItemGroup>
14+
<ReferenceCopyLocalPaths Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
15+
</ItemGroup>
16+
</Target>
17+
18+
<Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterComputeFilesToPublish" AfterTargets="ComputeFilesToPublish" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
19+
<ItemGroup>
20+
<ResolvedFileToPublish Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
21+
</ItemGroup>
22+
</Target>
23+
24+
<Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeComputeFilesToBundle" BeforeTargets="_ComputeFilesToBundle" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
25+
<ItemGroup>
26+
<ResolvedFileToPublish Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
27+
</ItemGroup>
28+
</Target>
29+
30+
<!--
31+
Remove from $(project).deps.json (sometimes the main deps file is reused)
32+
-->
33+
<Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigBeforeGenerateDependencyFile" BeforeTargets="GenerateBuildDependencyFile;GeneratePublishDependencyFile" Condition="'$(RuntimeIdentifier)' != '' AND '$(SelfContained)' == 'true'">
34+
<ItemGroup>
35+
<NativeCopyLocalItems Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
1436
</ItemGroup>
1537
</Target>
1638

@@ -40,100 +62,100 @@
4062
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">
4163
<ItemGroup>
4264
<Content Include="@(CefRuntimeWin64Locales)">
43-
<Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
44-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45-
<PublishState>Included</PublishState>
46-
<Visible>false</Visible>
47-
<IncludeInVsix>true</IncludeInVsix>
48-
</Content>
49-
<Content Include="@(CefRuntimeWin64SwiftShader)">
50-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
51-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
52-
<PublishState>Included</PublishState>
53-
<Visible>false</Visible>
54-
<IncludeInVsix>true</IncludeInVsix>
55-
</Content>
65+
<Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
66+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
67+
<PublishState>Included</PublishState>
68+
<Visible>false</Visible>
69+
<IncludeInVsix>true</IncludeInVsix>
70+
</Content>
71+
<Content Include="@(CefRuntimeWin64SwiftShader)">
72+
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
73+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
74+
<PublishState>Included</PublishState>
75+
<Visible>false</Visible>
76+
<IncludeInVsix>true</IncludeInVsix>
77+
</Content>
5678
</ItemGroup>
5779
</When>
58-
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">
80+
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">
5981
<ItemGroup>
6082
<Content Include="@(CefRuntimeWin32Locales)">
61-
<Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
62-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63-
<PublishState>Included</PublishState>
64-
<Visible>false</Visible>
65-
<IncludeInVsix>true</IncludeInVsix>
66-
</Content>
67-
<Content Include="@(CefRuntimeWin32SwiftShader)">
68-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
69-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
70-
<PublishState>Included</PublishState>
71-
<Visible>false</Visible>
72-
<IncludeInVsix>true</IncludeInVsix>
73-
</Content>
83+
<Link>locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
84+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
85+
<PublishState>Included</PublishState>
86+
<Visible>false</Visible>
87+
<IncludeInVsix>true</IncludeInVsix>
88+
</Content>
89+
<Content Include="@(CefRuntimeWin32SwiftShader)">
90+
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
91+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
92+
<PublishState>Included</PublishState>
93+
<Visible>false</Visible>
94+
<IncludeInVsix>true</IncludeInVsix>
95+
</Content>
7496
</ItemGroup>
7597
</When>
7698
<Otherwise>
7799
<ItemGroup>
78-
<PackageReference Include="chromiumembeddedframework.runtime.win-x64" Version="87.1.13" />
79-
<PackageReference Include="chromiumembeddedframework.runtime.win-x86" Version="87.1.13" />
100+
<PackageReference Include="chromiumembeddedframework.runtime.win-x64" Version="88.2.9" />
101+
<PackageReference Include="chromiumembeddedframework.runtime.win-x86" Version="88.2.9" />
80102
<Content Include="@(CefRuntimeWin32Locales)">
81-
<Link>runtimes\win-x86\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
82-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
83-
<PublishState>Included</PublishState>
84-
<Visible>false</Visible>
85-
<IncludeInVsix>true</IncludeInVsix>
86-
</Content>
87-
<Content Include="@(CefRuntimeWin32SwiftShader)">
88-
<Link>runtimes\win-x86\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
89-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90-
<PublishState>Included</PublishState>
91-
<Visible>false</Visible>
92-
<IncludeInVsix>true</IncludeInVsix>
93-
</Content>
94-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\CefSharp.dll">
95-
<Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
96-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
97-
<PublishState>Included</PublishState>
98-
<Visible>false</Visible>
99-
<IncludeInVsix>true</IncludeInVsix>
100-
</Content>
101-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\Ijwhost.dll">
102-
<Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
103-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
104-
<PublishState>Included</PublishState>
105-
<Visible>false</Visible>
106-
<IncludeInVsix>true</IncludeInVsix>
107-
</Content>
108-
109-
<Content Include="@(CefRuntimeWin64Locales)">
110-
<Link>runtimes\win-x64\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
111-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112-
<PublishState>Included</PublishState>
113-
<Visible>false</Visible>
114-
<IncludeInVsix>true</IncludeInVsix>
115-
</Content>
116-
<Content Include="@(CefRuntimeWin64SwiftShader)">
117-
<Link>runtimes\win-x64\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
118-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119-
<PublishState>Included</PublishState>
120-
<Visible>false</Visible>
121-
<IncludeInVsix>true</IncludeInVsix>
122-
</Content>
123-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\CefSharp.dll">
124-
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
125-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126-
<PublishState>Included</PublishState>
127-
<Visible>false</Visible>
128-
<IncludeInVsix>true</IncludeInVsix>
129-
</Content>
130-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\Ijwhost.dll">
131-
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
132-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
133-
<PublishState>Included</PublishState>
134-
<Visible>false</Visible>
135-
<IncludeInVsix>true</IncludeInVsix>
136-
</Content>
103+
<Link>runtimes\win-x86\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
104+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105+
<PublishState>Included</PublishState>
106+
<Visible>false</Visible>
107+
<IncludeInVsix>true</IncludeInVsix>
108+
</Content>
109+
<Content Include="@(CefRuntimeWin32SwiftShader)">
110+
<Link>runtimes\win-x86\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
111+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112+
<PublishState>Included</PublishState>
113+
<Visible>false</Visible>
114+
<IncludeInVsix>true</IncludeInVsix>
115+
</Content>
116+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\CefSharp.dll">
117+
<Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
118+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119+
<PublishState>Included</PublishState>
120+
<Visible>false</Visible>
121+
<IncludeInVsix>true</IncludeInVsix>
122+
</Content>
123+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\Ijwhost.dll">
124+
<Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
125+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126+
<PublishState>Included</PublishState>
127+
<Visible>false</Visible>
128+
<IncludeInVsix>true</IncludeInVsix>
129+
</Content>
130+
131+
<Content Include="@(CefRuntimeWin64Locales)">
132+
<Link>runtimes\win-x64\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
133+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
134+
<PublishState>Included</PublishState>
135+
<Visible>false</Visible>
136+
<IncludeInVsix>true</IncludeInVsix>
137+
</Content>
138+
<Content Include="@(CefRuntimeWin64SwiftShader)">
139+
<Link>runtimes\win-x64\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
140+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
141+
<PublishState>Included</PublishState>
142+
<Visible>false</Visible>
143+
<IncludeInVsix>true</IncludeInVsix>
144+
</Content>
145+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\CefSharp.dll">
146+
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
147+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
148+
<PublishState>Included</PublishState>
149+
<Visible>false</Visible>
150+
<IncludeInVsix>true</IncludeInVsix>
151+
</Content>
152+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\Ijwhost.dll">
153+
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
154+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
155+
<PublishState>Included</PublishState>
156+
<Visible>false</Visible>
157+
<IncludeInVsix>true</IncludeInVsix>
158+
</Content>
137159
</ItemGroup>
138160
</Otherwise>
139161
</Choose>

0 commit comments

Comments
 (0)