mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixing test script issues and addressing RID detection change

Browse source
This commit is contained in:
piotrp 2016-01-09 18:04:13 -08:00
parent 5cd64066c4
commit 096b7d21dc
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/test/package-command-test.ps1
View file

@ -47,7 +47,7 @@ foreach {
$testName = "test\PackagedCommands\Consumers\$_" $testName = "test\PackagedCommands\Consumers\$_"
pushd "$RepoRoot\$testName" pushd "$RepoRoot\$testName"
$outputArray = dotnet hello | Out-String $outputArray = dotnet hello | Out-String
$output = [string]::Join('\n', $outputArray) $output = [string]::Join('\n', $outputArray).Trim("`r", "`n")
del "project.json" del "project.json"
if ($output -ne "hello") { if ($output -ne "hello") {
@ -55,7 +55,6 @@ foreach {
error " printed $output" error " printed $output"
Exit 1 Exit 1
} }
}
info "Test passed: $testName" info "Test passed: $testName"
popd popd

2
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -356,7 +356,7 @@ namespace Microsoft.DotNet.Tools.Compiler
{ {
var projectContext = var projectContext =
ProjectContext.Create(context.ProjectDirectory, context.TargetFramework, ProjectContext.Create(context.ProjectDirectory, context.TargetFramework,
new[] {RuntimeIdentifier.Current}); new[] { PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier()});
projectContext projectContext
.CreateExporter(args.ConfigValue) .CreateExporter(args.ConfigValue)