PowerShell · rjmholt · Oct 2, 2018 · rjmholt · Oct 2, 2018 · rjmholt
diff --git a/src/PowerShellEditorServices/Session/InvocationEventQueue.cs b/src/PowerShellEditorServices/Session/InvocationEventQueue.cs
diff --git a/.../PowerShellEditorServices.Test.Shared/Completion/CompletionExamples.psm1 b/.../PowerShellEditorServices.Test.Shared/Completion/CompletionExamples.psm1
diff --git a/test/PowerShellEditorServices.Test.Shared/References/ReferenceFileA.ps1 b/test/PowerShellEditorServices.Test.Shared/References/ReferenceFileA.ps1
-. .\ReferenceFileA.ps1
-. .\ReferenceFileB.ps1
-. .\ReferenceFileC.ps1
+. ./ReferenceFileA.ps1
diff --git a/src/PowerShellEditorServices/Session/PowerShellContext.cs b/src/PowerShellEditorServices/Session/PowerShellContext.cs
diff --git a/src/PowerShellEditorServices/Session/PowerShell5Operations.cs b/src/PowerShellEditorServices/Session/PowerShell5Operations.cs
diff --git a/src/PowerShellEditorServices/Language/FindSymbolsVisitor2.cs b/src/PowerShellEditorServices/Language/FindSymbolsVisitor2.cs
@@ -8,18 +8,16 @@

 namespace Microsoft.PowerShell.EditorServices
 {
-#if PowerShellv5
-
    // TODO: Restore this when we figure out how to support multiple
diff --git a/.../PowerShellEditorServices.Test.Shared/Completion/CompletionExamples.psm1 b/.../PowerShellEditorServices.Test.Shared/Completion/CompletionExamples.psm1
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
+
+    if ($DestinationPath -eq $null) {
+        $DestinationPath = Join-Path $tmpDir $DllName
+    } elseif (Test-Path $DestinationPath -PathType Container) {
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
+
+    $packageDirPath = Join-Path $tmpDir "$PackageName.$PackageVersion"
+    if (-not (Test-Path $packageDirPath)) {
+        $tmpNupkgPath = Join-Path $tmpDir 'tmp.zip'
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
+    return $DestinationPath
+}
+
+function Invoke-WithCreateDefaultHook {
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
diff --git a/src/PowerShellEditorServices/Session/InvocationEventQueue.cs b/src/PowerShellEditorServices/Session/InvocationEventQueue.cs
diff --git a/src/PowerShellEditorServices/Session/PowerShell5Operations.cs b/src/PowerShellEditorServices/Session/PowerShell5Operations.cs
diff --git a/test/PowerShellEditorServices.Test.Host/ServerTestsBase.cs b/test/PowerShellEditorServices.Test.Host/ServerTestsBase.cs
diff --git a/test/PowerShellEditorServices.Test.Shared/References/ReferenceFileA.ps1 b/test/PowerShellEditorServices.Test.Shared/References/ReferenceFileA.ps1
diff --git a/test/PowerShellEditorServices.Test/Session/WorkspaceTests.cs b/test/PowerShellEditorServices.Test/Session/WorkspaceTests.cs
+#if !CoreCLR
+            string tempDir = Environment.GetEnvironmentVariable("TEMP");
+#else
+            string tempDir = Path.GetTempPath();
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
@@ -135,7 +135,8 @@ function Get-NugetAsmForRuntime {

    $packageDirPath = Join-Path $tmpDir "$PackageName.$PackageVersion"
    if (-not (Test-Path $packageDirPath)) {
-        $tmpNupkgPath = Join-Path $tmpDir 'tmp.zip'
+        $guid = New-Guid
+        $tmpNupkgPath = Join-Path $tmpDir "$guid.zip"
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
        exec { & $script:dotnetExe xunit -f $script:TestRuntime.Core --fx-version $script:NetCoreTestingFrameworkVersion }
    }
 }

-task TestHost -If {
+task TestHost {