Commit Graph
15 Commits
Author SHA1 Message Date
Andrew Schwartzmeyer fdfd02ccda Remove TPA list work-around 2016-06-28 18:31:38 -07:00
Andrew Schwartzmeyer c58c7d3543 Assert basePaths was not null 2016-06-28 18:31:38 -07:00
Andrew Schwartzmeyer 6356a5a778 Mimic InitializeDefaultLoadContext 2016-06-28 18:31:38 -07:00
Andrew Schwartzmeyer 9fbb63cd08 Revert ALC rename 2016-05-31 13:22:25 -07:00
Jan Kotas ef9a37df79 Rename PowerShellAssemblyLoadContext to PowerShellAssemblyLoader
PowerShellAssemblyLoadContext does not inherit from AssemblyLoadContext. Rename
it to avoid confusion.
2016-05-24 09:55:04 -07:00
Jan Kotas 44ba0bb28f Switch from AssemblyLoadContext.InitializeDefaultContext to AssemblyLoadContext.Resolving event
AssemblyLoadContext.InitializeDefaultContext was removed for .NET Core 1.0 RTM. Replaced its use
with AssemblyLoadContext.Resolving event.
2016-05-24 09:55:04 -07:00
Andy Schwartzmeyer a655b439bc Merge pull request #850 from PowerShell/andschwa/fix-xunit
Re-enable xUnit tests on Linux
2016-04-18 19:27:55 -07:00
Andrew Schwartzmeyer 3b24ba5dd3 Allow default ALC to not be PowerShell's. 2016-04-14 18:07:33 -07:00
Andrew Schwartzmeyer 40b3888dcb Revert use of foreach in ALC
I forgot to revert this in #814, thanks @daxian-dbw for the pointer.
2016-04-14 17:34:00 -07:00
Andrew Schwartzmeyer 1bc2a9e576 Fix stack overflow exception when loading assemblies
When an assembly that exists outside of the trusted platform assembly
list but in the GAC on Windows was loaded, the use of `Assembly.Load`
before the `LoadFromAssemblyPath` caused a recursive loop to occur.

This happens because an `Assembly.Load` on a not-yet-loaded
assembly is overridden, thus calling back into the
`AssemblyLoadContext.Load` override.

By attempting to load from the file path first, we avoid this loop.
However, loading TPA assemblies by their path throws an exception, so
now we catch this particular exception and attempt the load through
`Assembly.Load`.

This is safe for TPA assemblies since they're already loaded, thus the
`Assembly.Load` does not re-load the assembly, but simply returns it.
2016-04-13 09:40:16 -07:00
Andrew Schwartzmeyer 839014b599 Try Assembly.Load correctly
This should resolve #791.

Instead of checking if `Assembly.Load` returned null (it doesn't), check
if it threw `FileNotFoundException`, which it will if it doesn't find
the assembly.
2016-04-08 19:09:38 -07:00
PowerShell Team 78a18c3f70 Revert "Update files from psl-monad"
This reverts commit 9ed2c2a68b.
This commit is here to make source-depot branch a parent of master
2016-04-06 12:03:50 -07:00
PowerShell Team 9ed2c2a68b Update files from psl-monad
This commit uses psl-monad branch source-depot 28156300
And corresponds to [SD:692351]
2016-04-06 11:55:18 -07:00
PowerShell Team 45140c5752 Move files from psl-monad submodule to super-project
This commit uses master branch 860eb5d
2016-03-30 20:01:33 -07:00
PowerShell Team 60b3b304f2 Move files from psl-monad submodule to super-project
This commit uses psl-monad branch source-depot 7209cb9
And corresponds to [SD:688741]
2016-03-30 17:16:23 -07:00