From 0b6b1f116e4fd9ca05252b94d3e7663880fbf540 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 3 Dec 2015 15:14:30 -0800 Subject: [PATCH] Update for use with dotnet-cli https://github.com/dotnet/cli --- .gitignore | 1 + publish.sh | 4 +--- src/Microsoft.PowerShell.Linux.Host/project.json | 5 +++++ src/Microsoft.PowerShell.Linux.UnitTests/project.json | 5 ++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7b8277ec2..9c7812735 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.vscode/ project.lock.json *-tests.xml +obj/ \ No newline at end of file diff --git a/publish.sh b/publish.sh index 56162f2f7..67d5ce341 100755 --- a/publish.sh +++ b/publish.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash cd src/Microsoft.PowerShell.Linux.Host -source ~/.dnx/dnvm/dnvm.sh -dnvm use 1.0.0-rc2-16249 -dnu publish --out ../.. --runtime dnx-coreclr-linux-x64.1.0.0-rc2-16249 --no-source +dotnet publish --framework dnxcore50 --runtime ubuntu.14.04-x64 --output ../../bin cd ../.. diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index 145258da0..c9a800df8 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -6,7 +6,12 @@ "projectUrl": "", "licenseUrl": "", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.NETCore.Runtime": "1.0.1-beta-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "System.Management.Automation": "", "Microsoft.PowerShell.Security": "", diff --git a/src/Microsoft.PowerShell.Linux.UnitTests/project.json b/src/Microsoft.PowerShell.Linux.UnitTests/project.json index c59bb29bd..e74c0109d 100644 --- a/src/Microsoft.PowerShell.Linux.UnitTests/project.json +++ b/src/Microsoft.PowerShell.Linux.UnitTests/project.json @@ -7,6 +7,7 @@ "licenseUrl": "", "dependencies": { + "Microsoft.NETCore.Runtime": "1.0.1-beta-*", "System.Management.Automation": "", "Microsoft.PowerShell.Security": "", "Microsoft.PowerShell.Commands.Utility": "", @@ -15,9 +16,7 @@ "xunit.runner.dnx": "2.1.0-*" }, - "commands": { - "test": "xunit.runner.dnx" - }, + "TestRunner": "xunit", "frameworks": { "dnxcore50": {