Skip to content

Commit

Permalink
ClickOnce - Remove attempt at AnyCPU workaround
Browse files Browse the repository at this point in the history
Wasn't working so reverting for now
  • Loading branch information
amaitland committed Sep 23, 2021
1 parent a566c28 commit 3f27c9d
Showing 1 changed file with 0 additions and 35 deletions.
35 changes: 0 additions & 35 deletions CefSharp.BrowserSubprocess/Program.cs
Expand Up @@ -2,10 +2,7 @@
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using CefSharp.RenderProcess;

namespace CefSharp.BrowserSubprocess
Expand All @@ -23,38 +20,6 @@ public static int Main(string[] args)
{
Debug.WriteLine("BrowserSubprocess starting up with command line: " + string.Join("\n", args));

if(!File.Exists("CefSharp.dll"))
{
//For publshing ClickOnce AnyCPU CefSharp.dll isn't included in the x64 build
//and the BrowserSubprocess fails to launch as a result.
//As a temp workaround load the file from the parent directory.
AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
}

return MainInternal(args);
}

private static System.Reflection.Assembly AssemblyResolve(object sender, ResolveEventArgs args)
{
if (args.Name.StartsWith("CefSharp.dll"))
{
AppDomain.CurrentDomain.AssemblyResolve -= AssemblyResolve;

var path = Path.GetFullPath("..\\CefSharp.dll");

//Load CefSharp.dll from parent directory for AnyCPU Clickonce
if (File.Exists(path))
{
return System.Reflection.Assembly.LoadFile(path);
}
}

return null;
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static int MainInternal(string[] args)
{
SubProcess.EnableHighDPISupport();

//Add your own custom implementation of IRenderProcessHandler here
Expand Down

0 comments on commit 3f27c9d

Please sign in to comment.