Skip to content

Support .NET Framework 4.6.1 #2701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Metadorius wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Support .NET Framework 4.6.1 #2701

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63cf5a7
Support .NET Framework 4.6.1
Metadorius Mar 26, 2026
d2db7c7
Add a PyInstaller hook to handle files correctly in PyInstaller
Metadorius Mar 27, 2026
8c6b4ca
docs
Metadorius Mar 27, 2026
ba57bb5
remove leftover
Metadorius Mar 27, 2026
ef2c11a
unbreak non-FW builds
Metadorius Apr 3, 2026
c41fa83
Merge branch 'master' into feature/net461
filmor Apr 18, 2026
26442b8
Merge branch 'master' into feature/net461
filmor Apr 18, 2026
a30ac9d
Merge branch 'master' into feature/net461
filmor Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unbreak non-FW builds
  • Loading branch information
@Metadorius
Metadorius committed Apr 3, 2026
commit ef2c11aec496538e357da95d39366ae35be15f1d
22 changes: 14 additions & 8 deletions src/runtime/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,22 @@ public unsafe static int Initialize(IntPtr data, int size)
// Version=0.0.0.0 vs the 4.0.2.0 shim on disk). Binding redirects
// via config files can't be injected after AppDomain creation, so
// resolve assemblies from our runtime directory directly.
AppDomain.CurrentDomain.AssemblyResolve += (_, args) =>
// Only needed on .NET Framework; on .NET (Core) this causes
// duplicate assembly loads, as .deps.json is respected and
// the correct assembly is already found.
if (typeof(object).Assembly.GetName().Name == "mscorlib")
{
var name = new System.Reflection.AssemblyName(args.Name);
var dir = Path.GetDirectoryName(typeof(Loader).Assembly.Location);
var path = Path.Combine(dir, name.Name + ".dll");
AppDomain.CurrentDomain.AssemblyResolve += (_, args) =>
{
var name = new System.Reflection.AssemblyName(args.Name);
var dir = Path.GetDirectoryName(typeof(Loader).Assembly.Location);
var path = Path.Combine(dir, name.Name + ".dll");

return File.Exists(path)
? System.Reflection.Assembly.LoadFrom(path)
: null;
};
return File.Exists(path)
? System.Reflection.Assembly.LoadFrom(path)
: null;
};
}

var dllPath = Encodings.UTF8.GetString((byte*)data.ToPointer(), size);

Expand Down
Loading