fast forward

.gitattributes

@@ -1,2 +1,7 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
+
+# .gitattributes in project root
+# npm now seems to be insisting on LF - see https://github.com/npm/npm/issues/17161
+package.json      text eol=lf
+package-lock.json text eol=lf

.gitignore

@@ -12,3 +12,4 @@ vscps-preview.zip
 *.vsix
 npm-debug.log
 .vscode-test/
+*.DS_Store

.travis.yml

@@ -11,13 +11,6 @@ dist: trusty
 osx_image: xcode8.3
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update;
-      brew install openssl;
-      mkdir -p /usr/local/lib;
-      ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/;
-      ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;
-    fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       nvm install v6.0.0;
     fi

.vscode/settings.json

@@ -4,6 +4,13 @@
     "editor.insertSpaces": true,
     "files.trimTrailingWhitespace": true,
 
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/bower_components": true,
+        "logs/": true,
+        "out/": true
+    },
+
     // Lock the TypeScript SDK path to the version we use
     "typescript.tsdk": "./node_modules/typescript/lib"
 }

.vscode/tasks.json

@@ -2,63 +2,70 @@
     "version": "2.0.0",
 
     "windows": {
-        "command": "${env:windir}/System32/WindowsPowerShell/v1.0/powershell.exe",
-        "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ]
+        "options": {
+            "shell": {
+                "executable": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+                "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command" ]
+            }
+        }
     },
     "linux": {
-        "command": "/usr/bin/powershell",
-        "args": [ "-NoProfile" ]
+        "options": {
+            "shell": {
+                "executable": "/usr/bin/pwsh",
+                "args": [ "-NoProfile", "-Command" ]
+            }
+        }
     },
     "osx": {
-        "command": "/usr/local/bin/powershell",
-        "args": [ "-NoProfile" ]
+        "options": {
+            "shell": {
+                "executable": "/usr/local/bin/pwsh",
+                "args": [ "-NoProfile", "-Command" ]
+            }
+        }
     },
 
     "tasks": [
         {
-            "taskName": "Install",
-            "suppressTaskName": true,
-            "args": [
-                "Invoke-Build Restore"
-            ]
+            "label": "Install",
+            "type": "shell",
+            "command": "Invoke-Build Restore",
+            "problemMatcher": []
         },
         {
-            "taskName": "CleanAll",
-            "suppressTaskName": true,
-            "args": [
-                "Invoke-Build CleanAll"
-            ]
+            "label": "CleanAll",
+            "type": "shell",
+            "command": "Invoke-Build CleanAll",
+            "problemMatcher": []
         },
         {
-            "taskName": "Clean",
-            "suppressTaskName": true,
-            "args": [
-                "Invoke-Build Clean"
-            ]
+            "label": "Clean",
+            "type": "shell",
+            "command": "Invoke-Build Clean",
+            "problemMatcher": []
         },
         {
-            "taskName": "BuildAll",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
-            "args": [
-                "Invoke-Build BuildAll"
-            ],
+            "label": "BuildAll",
+            "type": "shell",
+            "command": "Invoke-Build BuildAll",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "problemMatcher": []
         },
         {
-            "taskName": "Build",
-            "suppressTaskName": true,
-            "args": [
-                "Invoke-Build Build"
-            ],
+            "label": "Build",
+            "type": "shell",
+            "command": "Invoke-Build Build",
+            "group": "build",
             "problemMatcher": []
         },
         {
-            "taskName": "Test",
-            "suppressTaskName": true,
-            "args": [
-                "Invoke-Build Test"
-            ],
+            "label": "Test",
+            "type": "shell",
+            "command": "Invoke-Build Test",
             "group": {
                 "kind": "test",
                 "isDefault": true

CHANGELOG.md

@@ -1,5 +1,67 @@
 # vscode-powershell Release History
 
+## 1.5.0
+### Friday, October 27, 2017
+
+#### Fixes and Improvements
+
+- [PowerShell/vscode-powershell #820](https://github.com/PowerShell/vscode-powershell/issues/820) -
+  Added new "Upload Bug Report to GitHub" command to make it easy to post an issue to the vscode-powershell GitHub repo.  Thanks to [Mark Schill](https://github.com/PowerSchill)!
+
+- [PowerShell/vscode-powershell #910](https://github.com/PowerShell/vscode-powershell/issues/910) -
+  Set-VSCodeHtmlContentView cmdlet now exposes `JavaScriptPaths` and `StyleSheetPaths` parameters to allow using JavaScript code and CSS stylesheets in VS Code HTML preview views.
+
+- [PowerShell/vscode-powershell #909](https://github.com/PowerShell/vscode-powershell/issues/909) -
+  Write-VSCodeHtmlContentView's AppendBodyContent now accepts input from the pipeline
+
+- [PowerShell/vscode-powershell #1071](https://github.com/PowerShell/vscode-powershell/pull/1071) -
+  Updated session menu to find PowerShell Core installs with the new pwsh.exe path
+
+- [PowerShell/vscode-powershell #842](https://github.com/PowerShell/vscode-powershell/issues/842) -
+  psedit can now open empty files in remote sessions
+
+- [PowerShell/vscode-powershell #1040](https://github.com/PowerShell/vscode-powershell/issues/1040) -
+  Non-PowerShell files opened in remote sessions using psedit can now be saved back to the remote server
+
+- [PowerShell/vscode-powershell #660](https://github.com/PowerShell/vscode-powershell/issues/660) -
+  Set/Enable/Disable/Remove-PSBreakpoint commands now cause the VS Code breakpoint UI to be updated while the debugger is active
+
+- [PowerShell/vscode-powershell #625](https://github.com/PowerShell/vscode-powershell/issues/625) -
+  Breakpoints are now cleared from the session when the debugger starts so that stale breakpoints from previous sessions are not hit
+
+- [PowerShell/vscode-powershell #1004](https://github.com/PowerShell/vscode-powershell/issues/1004) -
+  Handle exception case when finding references of a symbol
+
+- [PowerShell/vscode-powershell #942](https://github.com/PowerShell/vscode-powershell/issues/942) -
+  Temporary debugging session now does not hang when running "PowerShell Interactive Session" debugging configuration
+
+- [PowerShell/vscode-powershell #917](https://github.com/PowerShell/vscode-powershell/issues/917) -
+  Added PowerShell.InvokeRegisteredEditorCommand command to be used from HTML preview views for invoking editor commands registered in PowerShell.  Thanks to [Kamil Kosek](https://github.com/kamilkosek)!
+
+- [PowerShell/vscode-powershell #872](https://github.com/PowerShell/vscode-powershell/issues/872) -
+  Watch variables with children are now expandable
+
+- [PowerShell/vscode-powershell #1060](https://github.com/PowerShell/vscode-powershell/issues/1060)  -
+  $psEditor.Workspace.NewFile() now works again in VSC 1.18.0 Insiders builds
+
+- [PowerShell/vscode-powershell #1046](https://github.com/PowerShell/vscode-powershell/issues/1046)  -
+  Debugging now works again in VSC 1.18.0 Insiders builds
+
+- [PowerShell/PowerShellEditorServices #342](https://github.com/PowerShell/PowerShellEditorServices/issues/342) -
+  Unexpected file URI schemes are now handled more reliably
+
+- [PowerShell/PowerShellEditorServices #396](https://github.com/PowerShell/PowerShellEditorServices/issues/396) -
+  Resolved errors being written to Integrated Console when running native applications while transcription is turned on
+
+- [PowerShell/PowerShellEditorServices #529](https://github.com/PowerShell/PowerShellEditorServices/issues/529) -
+  Fixed an issue with loading the PowerShellEditorServices module in PowerShell Core 6.0.0-beta3
+
+- [PowerShell/PowerShellEditorServices #533](https://github.com/PowerShell/PowerShellEditorServices/pull/533)  -
+  Added new $psEditor.GetCommand() method for getting all registered editor commands.  Thanks to [Kamil Kosek](https://github.com/kamilkosek)!
+
+- [PowerShell/PowerShellEditorServices #535](https://github.com/PowerShell/PowerShellEditorServices/pull/535)  -
+  Type information is now exposed on hover for variables in the Variables view
+
 ## 1.4.3
 ### Wednesday, September 13, 2017
 

README.md

@@ -81,11 +81,14 @@ check out the included [README.md](examples/README.md) file to learn more about
 how to use them.
 
 This folder can be found at the following path:
+
 ```
-c:\Users\<yourusername>\.vscode\extensions\ms-vscode.PowerShell-<version>\examples
+C:\Users\<yourusername>\.vscode\extensions\ms-vscode.PowerShell-<version>\examples
 ```
+
 To open/view the extension's examples in Visual Studio Code, run the following from your PowerShell command prompt:
-```
+
+```powershell
 code (Get-ChildItem $Home\.vscode\extensions\ms-vscode.PowerShell-*\examples)[-1]
 ```
 
@@ -99,6 +102,8 @@ to file an issue on our GitHub repository:
 Make sure to fill in the information that is requested in the issue template as it
 will help us investigate the problem more quickly.
 
+> Note To automatically create a bug report from within the extension run the *"Report a problem on GitHub"* command. Some basic information about your instance and powershell versions will be collected and inserted into a new GitHub issue.
+
 ### 2. Capture verbose logs and send them to us
 
 If you're having an issue with crashing or other erratic behavior, add the following
@@ -123,7 +128,6 @@ You have two options for sending us the logs:
   2. If you are editing scripts that don't contain sensitive information, you can drag and
      drop your logs ZIP file into the GitHub issue that you are creating.
 
-
 ## Contributing to the Code
 
 Check out the [development documentation](docs/development.md) for more details

appveyor.yml

@@ -1,4 +1,4 @@
-version: '1.4.3-insiders-{build}'
+version: '1.5.0-insiders-{build}'
 image: Visual Studio 2017
 clone_depth: 10
 skip_tags: true

build/download.sh

@@ -113,34 +113,8 @@ case "$OSTYPE" in
         esac
         ;;
     darwin*)
-        patched=0
-        if hash brew 2>/dev/null; then
-            brew update
-            if [[ ! -d $(brew --prefix openssl) ]]; then
-               echo "Installing OpenSSL with brew..."
-               if ! brew install openssl; then
-                   echo "ERROR: OpenSSL failed to install! Crypto functions will not work..." >&2
-                   # Don't abort because it is not fatal
-               elif ! brew install curl --with-openssl; then
-                   echo "ERROR: curl failed to build against OpenSSL; SSL functions will not work..." >&2
-                   # Still not fatal
-               else
-                   # OpenSSL installation succeeded; reme           mber to patch System.Net.Http after PowerShell installation
-                   patched=1
-               fi
-            fi
-
-        else
-            echo "ERROR: brew not found! OpenSSL may not be available..." >&2
-            # Don't abort because it is not fatal
-        fi
-
         echo "Installing $package with sudo ..."
         sudo installer -pkg "./$package" -target /
-        if [[ $patched -eq 1 ]]; then
-            echo "Patching System.Net.Http for libcurl and OpenSSL..."
-            find /usr/local/microsoft/powershell -name System.Net.Http.Native.dylib | xargs sudo install_name_tool -change /usr/lib/libcurl.4.dylib /usr/local/opt/curl/lib/libcurl.4.dylib
-        fi
         ;;
 esac
 

docs/troubleshooting.md

@@ -19,9 +19,12 @@ This issue has been resolved in PowerShell 5.1.
 
 ### 1. PowerShell IntelliSense does not work, can't debug scripts
 
-The most common problem when the PowerShell extension doesn't work on macOS is that
-OpenSSL is not installed.  You can check for the installation of OpenSSL by looking for
-the following files:
+The most common problem when the PowerShell extension doesn't work on macOS is that you have
+an alpha version of PowerShell installed. To upgrade to the latest beta, please follow the
+[Install Instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#macos-1012).
+
+If you'd prefer to use an alpha version of PowerShell, then OpenSSL must be installed.
+You can check for the installation of OpenSSL by looking for the following files:
 
 If installed using Homebrew: