-
Notifications
You must be signed in to change notification settings - Fork 937
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.
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
Upgrade to JSPool 3.0 #421
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2017-Present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Reflection; | ||
|
|
||
| namespace React.MSBuild | ||
| { | ||
| /// <summary> | ||
| /// Hacks around the fact that it's not possible to do assembly binding redirects in MSBuild. | ||
| /// | ||
| /// https://github.com/Microsoft/msbuild/issues/1309 | ||
| /// http://blog.slaks.net/2013-12-25/redirecting-assembly-loads-at-runtime/ | ||
| /// </summary> | ||
| public static class AssemblyBindingRedirect | ||
| { | ||
| /// <summary> | ||
| /// Redirects that have been configured | ||
| /// </summary> | ||
| private static readonly Dictionary<string, Version> _redirects = new Dictionary<string, Version>(); | ||
|
|
||
| static AssemblyBindingRedirect() | ||
| { | ||
| // This is in a static constructor because it needs to run as early as possible | ||
| ConfigureRedirect("JavaScriptEngineSwitcher.Core"); | ||
| AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Enables assembly binding redirects | ||
| /// </summary> | ||
| public static void Enable() | ||
| { | ||
| // Intentionally empty. This is just meant to ensure the static constructor | ||
| // has run. | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Configures a redirect for the specified assembly. Redirects to the version in the bin directory. | ||
| /// </summary> | ||
| /// <param name="name">Name of the assembly to redirect</param> | ||
| private static void ConfigureRedirect(string name) | ||
| { | ||
| var currentAssemblyPath = Assembly.GetExecutingAssembly().Location; | ||
| var redirectAssemblyPath = Path.Combine( | ||
| Path.GetDirectoryName(currentAssemblyPath), | ||
| name + ".dll" | ||
| ); | ||
|
|
||
| try | ||
| { | ||
| var realAssembly = Assembly.LoadFile(redirectAssemblyPath); | ||
| var version = realAssembly.GetName().Version; | ||
| _redirects[name] = version; | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Trace.WriteLine("Warning: Could not determine version of " + name + " to use! " + ex.Message); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Overrides assembly resolution to redirect if necessary. | ||
| /// </summary> | ||
| private static Assembly ResolveAssembly(object sender, ResolveEventArgs args) | ||
| { | ||
| var requestedAssembly = new AssemblyName(args.Name); | ||
|
|
||
| if (_redirects.ContainsKey(requestedAssembly.Name) && requestedAssembly.Version != _redirects[requestedAssembly.Name]) | ||
| { | ||
| requestedAssembly.Version = _redirects[requestedAssembly.Name]; | ||
| return Assembly.Load(requestedAssembly); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is probably not needed... The call site could just call
Disposeon the engine directly.