Fixing test script issues and addressing RID detection change

scripts/test/package-command-test.ps1

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

src/Microsoft.DotNet.Tools.Compiler/Program.cs

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