mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
Brought back PowerShell's AssemblyLoadContext
Removes dependency on Microsoft.Extensions.Platform.Abstractions. Makes use of native executable from `dotnet-cli` impossible; must use `powershell` from monad-native.
This commit is contained in:
@@ -27,7 +27,6 @@
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
@@ -122,7 +122,6 @@
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
@@ -18,13 +18,6 @@ namespace Microsoft.PowerShell.Linux.Host
|
||||
/// </summary>
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
// create the typecatalog so they can find assemblies for a given type.
|
||||
TypeCatalog.GenerateTypeCatalog();
|
||||
if (System.Management.Automation.ClrHost.TypeCatalog == null)
|
||||
{
|
||||
Console.WriteLine("TypeCatalog generation failed!");
|
||||
}
|
||||
|
||||
// Custom argument parsing
|
||||
string initialScript = null;
|
||||
if (args.Length > 0)
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
@@ -6,6 +6,22 @@
|
||||
"projectUrl": "",
|
||||
"licenseUrl": "",
|
||||
|
||||
"dependencies": {
|
||||
"Microsoft.Management.Infrastructure" : "",
|
||||
"Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": ""
|
||||
},
|
||||
|
||||
"compilationOptions": {
|
||||
"define": [
|
||||
"CORECLR",
|
||||
"_CORECLR",
|
||||
"LINUX"
|
||||
],
|
||||
"allowUnsafe": true
|
||||
},
|
||||
|
||||
"compile" : [ "../monad-build/gen/SYS_AUTO/*.cs" ],
|
||||
|
||||
"compileFiles": [
|
||||
"../monad/monad/src/engine/ChildrenCmdletProviderInterfaces.cs",
|
||||
"../monad/monad/src/engine/CmdletFamilyProviderInterfaces.cs",
|
||||
@@ -584,20 +600,6 @@
|
||||
"../monad/monad/src/DscSupport/CimDSCParser.cs"
|
||||
],
|
||||
|
||||
"compile" : [
|
||||
"../monad-build/gen/SYS_AUTO/*.cs"
|
||||
],
|
||||
|
||||
"compilationOptions": {
|
||||
"define": [
|
||||
"CORECLR",
|
||||
"_CORECLR",
|
||||
"NOALC",
|
||||
"LINUX"
|
||||
],
|
||||
"allowUnsafe": true
|
||||
},
|
||||
|
||||
"namedResource": {
|
||||
"Authenticode": "../monad/monad/src/engine/resources/Authenticode.resx",
|
||||
"AutomationExceptions" : "../monad/monad/src/engine/resources/AutomationExceptions.resx",
|
||||
@@ -667,14 +669,9 @@
|
||||
"Modules" : "../monad/monad/src/engine/resources/modules.resx"
|
||||
},
|
||||
|
||||
"dependencies": {
|
||||
"Microsoft.Management.Infrastructure" : ""
|
||||
},
|
||||
|
||||
"frameworks": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
|
||||
"Microsoft.CSharp": "4.0.1-*",
|
||||
"Microsoft.VisualBasic": "10.0.1-*",
|
||||
"Microsoft.Win32.Primitives": "4.0.1-*",
|
||||
|
||||
Reference in New Issue
Block a user