Programmatic update of core console host rename
This commit is contained in:
parent
5abda1c223
commit
bfaad3f057
|
@ -103,7 +103,7 @@ function Start-PSBuild {
|
||||||
$Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"
|
$Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"
|
||||||
$Framework = 'net451'
|
$Framework = 'net451'
|
||||||
} else {
|
} else {
|
||||||
$Top = "$PSScriptRoot/src/Microsoft.PowerShell.Host"
|
$Top = "$PSScriptRoot/src/Microsoft.PowerShell.CoreConsoleHost"
|
||||||
$Framework = 'netstandardapp1.5'
|
$Framework = 'netstandardapp1.5'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ test_script:
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
#
|
#
|
||||||
# CoreCLR
|
# CoreCLR
|
||||||
$env:CoreOutput = "$pwd\src\Microsoft.PowerShell.Host\bin\Debug\netstandardapp1.5\win81-x64"
|
$env:CoreOutput = "$pwd\src\Microsoft.PowerShell.CoreConsoleHost\bin\Debug\netstandardapp1.5\win81-x64"
|
||||||
Write-Host -Foreground Green 'Run CoreCLR tests'
|
Write-Host -Foreground Green 'Run CoreCLR tests'
|
||||||
$testResultsFile = "$pwd\TestsResults.xml"
|
$testResultsFile = "$pwd\TestsResults.xml"
|
||||||
& ("$env:CoreOutput\powershell.exe") -c "Invoke-Pester test/powershell -OutputFormat NUnitXml -OutputFile $testResultsFile"
|
& ("$env:CoreOutput\powershell.exe") -c "Invoke-Pester test/powershell -OutputFormat NUnitXml -OutputFile $testResultsFile"
|
||||||
|
|
|
@ -105,7 +105,7 @@ Start-PSBuild
|
||||||
|
|
||||||
Congratulations! If everything went right, PowerShell is now built.
|
Congratulations! If everything went right, PowerShell is now built.
|
||||||
The `Start-PSBuild` script will output the location of the executable:
|
The `Start-PSBuild` script will output the location of the executable:
|
||||||
`./src/Microsoft.PowerShell.Host/bin/Linux/netstandardapp1.5/ubuntu.14.04-x64/powershell`.
|
`./src/Microsoft.PowerShell.CoreConsoleHost/bin/Linux/netstandardapp1.5/ubuntu.14.04-x64/powershell`.
|
||||||
|
|
||||||
> Note that the `./build.sh` script is deprecated and will be removed
|
> Note that the `./build.sh` script is deprecated and will be removed
|
||||||
|
|
||||||
|
@ -131,14 +131,14 @@ make test
|
||||||
popd
|
popd
|
||||||
```
|
```
|
||||||
|
|
||||||
This library will be emitted in the `src/Microsoft.PowerShell.Host`
|
This library will be emitted in the `src/Microsoft.PowerShell.CoreConsoleHost`
|
||||||
project, where `dotnet` consumes it as "content" and thus
|
project, where `dotnet` consumes it as "content" and thus
|
||||||
automatically deploys it.
|
automatically deploys it.
|
||||||
|
|
||||||
Build the managed projects
|
Build the managed projects
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
The `Microsoft.PowerShell.Host` project is the cross-platform host for
|
The `Microsoft.PowerShell.CoreConsoleHost` project is the cross-platform host for
|
||||||
PowerShell targetting .NET Core. It is the top level project, so
|
PowerShell targetting .NET Core. It is the top level project, so
|
||||||
`dotnet build` transitively builds all its dependencies, and emits a
|
`dotnet build` transitively builds all its dependencies, and emits a
|
||||||
`powershell` executable. The `--configuration Linux` flag is
|
`powershell` executable. The `--configuration Linux` flag is
|
||||||
|
@ -147,7 +147,7 @@ defined (see [issue #673][]).
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
dotnet restore
|
dotnet restore
|
||||||
cd src/Microsoft.PowerShell.Host
|
cd src/Microsoft.PowerShell.CoreConsoleHost
|
||||||
dotnet build --configuration Linux
|
dotnet build --configuration Linux
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ module.
|
||||||
|
|
||||||
The output directory will be slightly different because your runtime
|
The output directory will be slightly different because your runtime
|
||||||
identifier is different. PowerShell will be at
|
identifier is different. PowerShell will be at
|
||||||
`./src/Microsoft.PowerShell.Host/bin/Linux/netstandardapp1.5/osx.10.11-x64/powershell`,
|
`./src/Microsoft.PowerShell.CoreConsoleHost/bin/Linux/netstandardapp1.5/osx.10.11-x64/powershell`,
|
||||||
or `osx.10.10` depending on your operating system version. Note that
|
or `osx.10.10` depending on your operating system version. Note that
|
||||||
configration is still `Linux` because it would be silly to make yet
|
configration is still `Linux` because it would be silly to make yet
|
||||||
another separate configuration when it's used soley to work-around a
|
another separate configuration when it's used soley to work-around a
|
||||||
|
|
|
@ -70,11 +70,11 @@ Start-PSBuild
|
||||||
```
|
```
|
||||||
|
|
||||||
Congratulations! If everything went right, PowerShell is now built and
|
Congratulations! If everything went right, PowerShell is now built and
|
||||||
executable as `./src/Microsoft.PowerShell.Host/bin/Debug/netstandardapp1.5/win10-x64/powershell`.
|
executable as `./src/Microsoft.PowerShell.CoreConsoleHost/bin/Debug/netstandardapp1.5/win10-x64/powershell`.
|
||||||
|
|
||||||
This location is of the form
|
This location is of the form
|
||||||
`./[project]/bin/[configuration]/[framework]/[rid]/[binary name]`, and
|
`./[project]/bin/[configuration]/[framework]/[rid]/[binary name]`, and
|
||||||
our project is `Microsoft.PowerShell.Host`, configuration is `Debug`
|
our project is `Microsoft.PowerShell.CoreConsoleHost`, configuration is `Debug`
|
||||||
by default, framework is `netstandardapp1.5`, runtime identifier is
|
by default, framework is `netstandardapp1.5`, runtime identifier is
|
||||||
**probably** `win10-x64` (but will depend on your operating system;
|
**probably** `win10-x64` (but will depend on your operating system;
|
||||||
don't worry, `dotnet --info` will tell you what it was), and binary
|
don't worry, `dotnet --info` will tell you what it was), and binary
|
||||||
|
@ -82,7 +82,7 @@ name is `powershell`. The function `Get-PSOutput` will return the path
|
||||||
to the executable; thus you can execute the development copy via `&
|
to the executable; thus you can execute the development copy via `&
|
||||||
(Get-PSOutput)`.
|
(Get-PSOutput)`.
|
||||||
|
|
||||||
The `Microsoft.PowerShell.Host` project is the cross-platform host for
|
The `Microsoft.PowerShell.CoreConsoleHost` project is the cross-platform host for
|
||||||
PowerShell targetting .NET Core. It is the top level project, so
|
PowerShell targetting .NET Core. It is the top level project, so
|
||||||
`dotnet build` transitively builds all its dependencies, and emits a
|
`dotnet build` transitively builds all its dependencies, and emits a
|
||||||
`powershell` executable. The cross-platform host has built-in
|
`powershell` executable. The cross-platform host has built-in
|
||||||
|
|
|
@ -1187,12 +1187,12 @@
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1": "src/Modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1": "src/Modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.Host/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.CoreConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1": "src/Modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.CoreConsoleHost/Microsoft.PowerShell.CoreConsoleHost.psd1": "src/Modules/Microsoft.PowerShell.CoreConsoleHost/Microsoft.PowerShell.CoreConsoleHost.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "src/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "src/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1": "src/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1": "src/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.Host/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.CoreConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1": "src/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1",
|
"src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1": "src/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1",
|
||||||
"src/monad/monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "src/Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1",
|
"src/monad/monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "src/Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
namespace Microsoft.PowerShell.Host
|
namespace Microsoft.PowerShell.CoreConsoleHost
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
namespace Microsoft.PowerShell.Host
|
namespace Microsoft.PowerShell.CoreConsoleHost
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
|
@ -10,7 +10,7 @@ using System.Globalization;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace Microsoft.PowerShell.Host
|
namespace Microsoft.PowerShell.CoreConsoleHost
|
||||||
{
|
{
|
||||||
// this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx
|
// this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
namespace Microsoft.PowerShell.Host
|
namespace Microsoft.PowerShell.CoreConsoleHost
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
namespace Microsoft.PowerShell.Host
|
namespace Microsoft.PowerShell.CoreConsoleHost
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
|
@ -2055,7 +2055,7 @@ namespace System.Management.Automation.Runspaces
|
||||||
// Only load the core snapins at this point...
|
// Only load the core snapins at this point...
|
||||||
if (Environment.GetEnvironmentVariable("PowerShellMinimal") != null)
|
if (Environment.GetEnvironmentVariable("PowerShellMinimal") != null)
|
||||||
{
|
{
|
||||||
if (si.Name.Equals("Microsoft.PowerShell.Host", StringComparison.OrdinalIgnoreCase))
|
if (si.Name.Equals("Microsoft.PowerShell.CoreConsoleHost", StringComparison.OrdinalIgnoreCase))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -5530,7 +5530,7 @@ if($paths) {
|
||||||
"Microsoft.PowerShell.Utility",
|
"Microsoft.PowerShell.Utility",
|
||||||
"Microsoft.PowerShell.Management",
|
"Microsoft.PowerShell.Management",
|
||||||
"Microsoft.PowerShell.Diagnostics",
|
"Microsoft.PowerShell.Diagnostics",
|
||||||
"Microsoft.PowerShell.Host",
|
"Microsoft.PowerShell.CoreConsoleHost",
|
||||||
"Microsoft.PowerShell.Security",
|
"Microsoft.PowerShell.Security",
|
||||||
"Microsoft.WSMan.Management"
|
"Microsoft.WSMan.Management"
|
||||||
};
|
};
|
||||||
|
@ -5548,14 +5548,14 @@ if($paths) {
|
||||||
{ "Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility"},
|
{ "Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility"},
|
||||||
{ "Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management"},
|
{ "Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management"},
|
||||||
{ "Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics"},
|
{ "Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics"},
|
||||||
{ "Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost"},
|
{ "Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost"},
|
||||||
};
|
};
|
||||||
internal static Dictionary<string, string> NestedModuleEngineModuleMapping = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
|
internal static Dictionary<string, string> NestedModuleEngineModuleMapping = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
|
||||||
{
|
{
|
||||||
{ "Microsoft.PowerShell.Commands.Utility", "Microsoft.PowerShell.Utility"},
|
{ "Microsoft.PowerShell.Commands.Utility", "Microsoft.PowerShell.Utility"},
|
||||||
{ "Microsoft.PowerShell.Commands.Management", "Microsoft.PowerShell.Management"},
|
{ "Microsoft.PowerShell.Commands.Management", "Microsoft.PowerShell.Management"},
|
||||||
{ "Microsoft.PowerShell.Commands.Diagnostics", "Microsoft.PowerShell.Diagnostics"},
|
{ "Microsoft.PowerShell.Commands.Diagnostics", "Microsoft.PowerShell.Diagnostics"},
|
||||||
{ "Microsoft.PowerShell.ConsoleHost", "Microsoft.PowerShell.Host"},
|
{ "Microsoft.PowerShell.ConsoleHost", "Microsoft.PowerShell.CoreConsoleHost"},
|
||||||
{ "Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security"},
|
{ "Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security"},
|
||||||
{ "Microsoft.WSMan.Management", "Microsoft.WSMan.Management"},
|
{ "Microsoft.WSMan.Management", "Microsoft.WSMan.Management"},
|
||||||
};
|
};
|
||||||
|
|
|
@ -45,7 +45,7 @@ namespace System.Management.Automation
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Core", "System.Management.Automation.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Core", "System.Management.Automation.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security.dll-Help.xml");
|
||||||
engineModuleHelpFileCache.Add("Microsoft.WSMan.Management", "Microsoft.Wsman.Management.dll-Help.xml");
|
engineModuleHelpFileCache.Add("Microsoft.WSMan.Management", "Microsoft.Wsman.Management.dll-Help.xml");
|
||||||
|
|
|
@ -161,7 +161,7 @@ namespace Microsoft.PowerShell.Commands
|
||||||
metadataCache.Add("Microsoft.PowerShell.Diagnostics", "http://go.microsoft.com/fwlink/?linkid=390783");
|
metadataCache.Add("Microsoft.PowerShell.Diagnostics", "http://go.microsoft.com/fwlink/?linkid=390783");
|
||||||
metadataCache.Add("Microsoft.PowerShell.Core", "http://go.microsoft.com/fwlink/?linkid=390782");
|
metadataCache.Add("Microsoft.PowerShell.Core", "http://go.microsoft.com/fwlink/?linkid=390782");
|
||||||
metadataCache.Add("Microsoft.PowerShell.Utility", "http://go.microsoft.com/fwlink/?linkid=390787");
|
metadataCache.Add("Microsoft.PowerShell.Utility", "http://go.microsoft.com/fwlink/?linkid=390787");
|
||||||
metadataCache.Add("Microsoft.PowerShell.Host", "http://go.microsoft.com/fwlink/?linkid=390784");
|
metadataCache.Add("Microsoft.PowerShell.CoreConsoleHost", "http://go.microsoft.com/fwlink/?linkid=390784");
|
||||||
metadataCache.Add("Microsoft.PowerShell.Management", " http://go.microsoft.com/fwlink/?linkid=390785");
|
metadataCache.Add("Microsoft.PowerShell.Management", " http://go.microsoft.com/fwlink/?linkid=390785");
|
||||||
metadataCache.Add("Microsoft.PowerShell.Security", " http://go.microsoft.com/fwlink/?linkid=390786");
|
metadataCache.Add("Microsoft.PowerShell.Security", " http://go.microsoft.com/fwlink/?linkid=390786");
|
||||||
metadataCache.Add("Microsoft.WSMan.Management", "http://go.microsoft.com/fwlink/?linkid=390788");
|
metadataCache.Add("Microsoft.WSMan.Management", "http://go.microsoft.com/fwlink/?linkid=390788");
|
||||||
|
|
|
@ -64,7 +64,7 @@ namespace System.Management.Automation
|
||||||
|
|
||||||
//Name of default mshsnapins
|
//Name of default mshsnapins
|
||||||
internal const string CoreMshSnapinName = "Microsoft.PowerShell.Core";
|
internal const string CoreMshSnapinName = "Microsoft.PowerShell.Core";
|
||||||
internal const string HostMshSnapinName = "Microsoft.PowerShell.Host";
|
internal const string HostMshSnapinName = "Microsoft.PowerShell.CoreConsoleHost";
|
||||||
internal const string ManagementMshSnapinName = "Microsoft.PowerShell.Management";
|
internal const string ManagementMshSnapinName = "Microsoft.PowerShell.Management";
|
||||||
internal const string SecurityMshSnapinName = "Microsoft.PowerShell.Security";
|
internal const string SecurityMshSnapinName = "Microsoft.PowerShell.Security";
|
||||||
internal const string UtilityMshSnapinName = "Microsoft.PowerShell.Utility";
|
internal const string UtilityMshSnapinName = "Microsoft.PowerShell.Utility";
|
||||||
|
@ -1412,7 +1412,7 @@ namespace System.Management.Automation
|
||||||
new DefaultPSSnapInInformation("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics", null,
|
new DefaultPSSnapInInformation("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics", null,
|
||||||
"GetEventResources,Description", "GetEventResources,Vendor"),
|
"GetEventResources,Description", "GetEventResources,Vendor"),
|
||||||
|
|
||||||
new DefaultPSSnapInInformation("Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost", null,
|
new DefaultPSSnapInInformation("Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost", null,
|
||||||
"HostMshSnapInResources,Description","HostMshSnapInResources,Vendor"),
|
"HostMshSnapInResources,Description","HostMshSnapInResources,Vendor"),
|
||||||
#endif
|
#endif
|
||||||
CoreSnapin,
|
CoreSnapin,
|
||||||
|
|
|
@ -17,7 +17,7 @@ namespace ConsoleApplication
|
||||||
var outputPath = "../TypeCatalogGen/powershell.inc";
|
var outputPath = "../TypeCatalogGen/powershell.inc";
|
||||||
|
|
||||||
// Get a context for our top level project
|
// Get a context for our top level project
|
||||||
var context = ProjectContext.Create("../Microsoft.PowerShell.Host", NuGetFramework.Parse("netstandardapp1.5"));
|
var context = ProjectContext.Create("../Microsoft.PowerShell.CoreConsoleHost", NuGetFramework.Parse("netstandardapp1.5"));
|
||||||
|
|
||||||
System.IO.File.WriteAllLines(outputPath,
|
System.IO.File.WriteAllLines(outputPath,
|
||||||
// Get the target for the current runtime
|
// Get the target for the current runtime
|
||||||
|
|
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
|
||||||
project(PSL-NATIVE)
|
project(PSL-NATIVE)
|
||||||
|
|
||||||
add_compile_options(-std=c++11 -Wall -Werror)
|
add_compile_options(-std=c++11 -Wall -Werror)
|
||||||
set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.Host")
|
set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.CoreConsoleHost")
|
||||||
|
|
||||||
# test in BUILD_DIR
|
# test in BUILD_DIR
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using Xunit;
|
using Xunit;
|
||||||
using System;
|
using System;
|
||||||
using System.Management.Automation;
|
using System.Management.Automation;
|
||||||
using Microsoft.PowerShell.Host;
|
using Microsoft.PowerShell.CoreConsoleHost;
|
||||||
|
|
||||||
// This collection fixture initializes Core PowerShell's AssemblyLoadContext once and only
|
// This collection fixture initializes Core PowerShell's AssemblyLoadContext once and only
|
||||||
// once. Attempting to initialize in a class level fixture will cause multiple
|
// once. Attempting to initialize in a class level fixture will cause multiple
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"authors": [ "andschwa" ],
|
"authors": [ "andschwa" ],
|
||||||
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.PowerShell.Host": "1.0.0-*"
|
"Microsoft.PowerShell.CoreConsoleHost": "1.0.0-*"
|
||||||
},
|
},
|
||||||
|
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
|
|
|
@ -13,7 +13,7 @@ using System.Management.Automation.Provider;
|
||||||
using System.Management.Automation.Runspaces;
|
using System.Management.Automation.Runspaces;
|
||||||
using Microsoft.PowerShell;
|
using Microsoft.PowerShell;
|
||||||
using Microsoft.PowerShell.Commands;
|
using Microsoft.PowerShell.Commands;
|
||||||
using Microsoft.PowerShell.Host;
|
using Microsoft.PowerShell.CoreConsoleHost;
|
||||||
|
|
||||||
namespace PSTests
|
namespace PSTests
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,7 @@ using Xunit;
|
||||||
using System;
|
using System;
|
||||||
using System.Management.Automation;
|
using System.Management.Automation;
|
||||||
using System.Management.Automation.Runspaces;
|
using System.Management.Automation.Runspaces;
|
||||||
using Microsoft.PowerShell.Host;
|
using Microsoft.PowerShell.CoreConsoleHost;
|
||||||
|
|
||||||
namespace PSTests
|
namespace PSTests
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,7 +9,7 @@ using System.Management.Automation.Internal;
|
||||||
using System.Management.Automation.Internal.Host;
|
using System.Management.Automation.Internal.Host;
|
||||||
using System.Management.Automation.Runspaces;
|
using System.Management.Automation.Runspaces;
|
||||||
using Microsoft.PowerShell;
|
using Microsoft.PowerShell;
|
||||||
using Microsoft.PowerShell.Host;
|
using Microsoft.PowerShell.CoreConsoleHost;
|
||||||
|
|
||||||
namespace PSTests
|
namespace PSTests
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue