feature/netcoreapp2.1 #261
Merged
Conversation
This file contains hidden or 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
filipw
approved these changes
Apr 21, 2018
filipw
reviewed
Apr 21, 2018
| @@ -1,28 +1,48 @@ | |||
| #! "netcoreapp2.0" | |||
| #load "nuget:Dotnet.Build, 0.2.9" | |||
| #load "nuget:Dotnet.Build, 0.3.1" | |||
There was a problem hiding this comment.
Had to add the possibility to specify the target framework when doing DotNet.Publish since we now have multiple target frameworks. Otherwise nothing much to write home about 👍
filipw
reviewed
Apr 21, 2018
| } | ||
|
|
||
|
|
||
| [Fact(Skip = "This also failes when run a standard netcoreapp2.1 console app")] |
There was a problem hiding this comment.
we could still run this at least on netcoreapp2.0? Something like this should do:
public class OnlyOnNetCore20FactAttribute : FactAttribute
{
public OnlyOnNetCore20FactAttribute()
{
Skip = RuntimeHelper.TargetFramework != "netcoreapp2.0";
}
}
filipw
reviewed
Apr 21, 2018
| { | ||
| // Always prefer the resolved runtime dependency rather than the inherited assembly. | ||
| if(!dependencyMap.ContainsKey(inheritedAssemblyName.Name)) | ||
| loadedAssembliesMap.TryGetValue(runtimeAssembly.Name.Name, out var loadedAssembly); |
filipw
reviewed
Apr 21, 2018
| @@ -26,13 +24,7 @@ public class ScriptCompiler | |||
| // Note: Windows only, Mac and Linux needs something else? | |||
| [DllImport("Kernel32.dll")] | |||
| private static extern IntPtr LoadLibrary(string path); | |||
|
|
|||
| protected virtual IEnumerable<Assembly> ReferencedAssemblies => new[] | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds support for cross compiling
dotnet-scriptusingnetcoreapp2.0andnetcoreapp2.1The motivation for this is to fix #258 that requires global tools to be compiled for at least
netcoreapp2.1.Please refer to this issue for form information https://github.com/dotnet/cli/issues/9073
In the process of adding support for netcoreapp2.1, it was important that existing scripts that contained the
#! "netcoreapp2.0"pragma should continue to work.This resulted in a deep dive into how we add assemblies (metadatareferences) for a given script.
We used to add a couple of "inherited" assembly references from the host (dotnet-script) and then load the rest from the dependency context inferred from the script.
The initial hypothesis was that we needed to get rid of all inherited assembly references since there would be a possible mismatch between the host running as
netcoreapp2.1and the script dependencies being resolved in the context of anetcoreapp2.0application.As it turns out when compiling and executing a script , the script does not at all run in 100% isolation from the host. For instance it shares the same AssemblyLoadContext so that means we can't really ignore the assemblies already loaded into the host AppDomain/AssemblyLoadContext.
So the approach taken is that we now inherit "on demand" meaning that when we load a assembly reference from the script dependency context, we will now check if the assembly is already loaded by the host. If its already loaded we skip the reference from the script dependency context, otherwise we load it. This should also fix the scenario when we run as
netcoreapp2.0where we only have the ```netcoreapp2.1sdk installed.This change actually made all tests pass without suppressing
CS1705.In this PR we still suppress certain diagnostics, but they are now logged when running in debug mode
-dWhen it comes to the packages we produce nothing much has changed.
The tool package is compiled for
netcoreapp2.1while the rest of the packages arenetcoreapp2.0as before