Fix programatic references to Linux.Host

This commit is contained in:
Andrew Schwartzmeyer 2016-04-01 19:15:41 -07:00
parent bd599ed62a
commit 5a1666c984
16 changed files with 16 additions and 16 deletions

View File

@ -116,7 +116,7 @@ function Start-PSBuild {
$Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"
$Framework = 'net451'
} else {
$Top = "$PSScriptRoot/src/Microsoft.PowerShell.Linux.Host"
$Top = "$PSScriptRoot/src/Microsoft.PowerShell.Host"
$Framework = 'netstandardapp1.5'
}

View File

@ -20,7 +20,7 @@ install:
- ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
- ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
- git config --global url.git@github.com:.insteadOf https://github.com/
- git submodule update --init -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
- git submodule update --init -- src/windows-build src/Modules/Pester
- ps: Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1
- ps: ./install.ps1 -version 1.0.0-beta-002198

View File

@ -5,7 +5,7 @@ hash cmake 2>/dev/null || { echo >&2 "No cmake, please run 'sudo apt-get install
hash g++ 2>/dev/null || { echo >&2 "No g++, please run 'sudo apt-get install g++'"; exit 1; }
hash dotnet 2>/dev/null || { echo >&2 "No dotnet, please visit https://dotnet.github.io/getting-started/"; exit 1; }
TOP="$(pwd)/src/Microsoft.PowerShell.Linux.Host"
TOP="$(pwd)/src/Microsoft.PowerShell.Host"
# Test for lock file
test -r "$TOP/project.lock.json" || { echo >&2 "Please run 'dotnet restore' to download .NET Core packages"; exit 2; }

View File

@ -1,4 +1,4 @@
namespace Microsoft.PowerShell.Linux.Host
namespace Microsoft.PowerShell.Host
{
using System;
using System.Globalization;

View File

@ -1,4 +1,4 @@
namespace Microsoft.PowerShell.Linux.Host
namespace Microsoft.PowerShell.Host
{
using System;
using System.Collections.Generic;

View File

@ -10,7 +10,7 @@ using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
namespace Microsoft.PowerShell.Linux.Host
namespace Microsoft.PowerShell.Host
{
// this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx

View File

@ -1,4 +1,4 @@
namespace Microsoft.PowerShell.Linux.Host
namespace Microsoft.PowerShell.Host
{
using System;
using System.Collections.ObjectModel;

View File

@ -1,4 +1,4 @@
namespace Microsoft.PowerShell.Linux.Host
namespace Microsoft.PowerShell.Host
{
using System;
using System.Collections.Generic;

View File

@ -17,7 +17,7 @@ namespace ConsoleApplication
var outputPath = "../TypeCatalogGen/powershell.inc";
// Get a context for our top level project
var context = ProjectContext.Create("../Microsoft.PowerShell.Linux.Host", NuGetFramework.Parse("netstandardapp1.5"));
var context = ProjectContext.Create("../Microsoft.PowerShell.Host", NuGetFramework.Parse("netstandardapp1.5"));
System.IO.File.WriteAllLines(outputPath,
// Get the target for the current runtime

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
project(PSL-NATIVE)
add_compile_options(-std=c++11 -Wall -Werror)
set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.Linux.Host")
set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.Host")
# test in BUILD_DIR
enable_testing()

View File

@ -1,7 +1,7 @@
using Xunit;
using System;
using System.Management.Automation;
using Microsoft.PowerShell.Linux.Host;
using Microsoft.PowerShell.Host;
// This collection fixture initializes Core PowerShell's AssemblyLoadContext once and only
// once. Attempting to initialize in a class level fixture will cause multiple

View File

@ -5,7 +5,7 @@
"authors": [ "andschwa" ],
"dependencies": {
"Microsoft.PowerShell.Linux.Host": "1.0.0-*"
"Microsoft.PowerShell.Host": "1.0.0-*"
},
"frameworks": {

View File

@ -13,7 +13,7 @@ using System.Management.Automation.Provider;
using System.Management.Automation.Runspaces;
using Microsoft.PowerShell;
using Microsoft.PowerShell.Commands;
using Microsoft.PowerShell.Linux.Host;
using Microsoft.PowerShell.Host;
namespace PSTests
{

View File

@ -2,7 +2,7 @@ using Xunit;
using System;
using System.Management.Automation;
using System.Management.Automation.Runspaces;
using Microsoft.PowerShell.Linux.Host;
using Microsoft.PowerShell.Host;
namespace PSTests
{

View File

@ -9,7 +9,7 @@ using System.Management.Automation.Internal;
using System.Management.Automation.Internal.Host;
using System.Management.Automation.Runspaces;
using Microsoft.PowerShell;
using Microsoft.PowerShell.Linux.Host;
using Microsoft.PowerShell.Host;
namespace PSTests
{

View File

@ -13,7 +13,7 @@ pushd test/csharp
## Build
dotnet build -c Linux
## Work-around dotnet/cli#753
cp -r -f ../../src/Microsoft.PowerShell.Linux.Host/{Modules,*.so,*.dylib} bin/Linux/netstandardapp1.5/ubuntu.14.04-x64 2>/dev/null
cp -r -f ../../src/Microsoft.PowerShell.Host/{Modules,*.so,*.dylib} bin/Linux/netstandardapp1.5/ubuntu.14.04-x64 2>/dev/null
## Test
dotnet test -c Linux
result=$?