Merge branch 'release/0.7.0'

* release/0.7.0: (34 commits)
  (maint) Updated package-lock.json
  (GH-68) Switched to using extensionPack
  Bump vscode from 1.1.27 to 1.1.28
  Bump vscode from 1.1.26 to 1.1.27
  Bump typescript from 3.2.2 to 3.2.4
  Bump tslint from 5.12.0 to 5.12.1
  (build) Don't fail build on Chocolatey error
  (build) Corrected issue with doc generation
  (doc) Updated Gitter link
  Bump @types/node from 10.12.17 to 10.12.18
  Bump @types/node from 10.12.15 to 10.12.17
  Bump tslint from 5.11.0 to 5.12.0
  Bump @types/node from 10.12.14 to 10.12.15
  Bump @types/node from 10.12.12 to 10.12.14
  typos in readme
  Bump typescript from 3.2.1 to 3.2.2
  Bump vscode from 1.1.24 to 1.1.26
  Bump vscode from 1.1.22 to 1.1.24
  Bump @types/ini from 1.3.29 to 1.3.30
  Bump @types/node from 6.0.117 to 10.12.12
  ...

Author: gep13

.mergify.yml

@@ -0,0 +1,5 @@
+pull_request_rules:
+  - name: delete head branch after merge
+    conditions: []
+    actions:
+      delete_head_branch: {}

README.md

@@ -24,7 +24,7 @@ For more information about [Chocolatey](https://chocolatey.org/), please see the
 
 ## Commands
 
-The Chocolatey Visual Studio Code provides the following commands:
+The Chocolatey Visual Studio Code Extension provides the following commands:
 
 * `Chocolatey: Create new Chocolatey package` to create the default templated Chocolatey package at the root of current workspace.
 * `Chocolatey: Pack Chocolatey package(s)` to search current workspace for nuspec files and package them
@@ -43,7 +43,7 @@ To use them, simply open your powershell file, and then type `choco` followed by
 
 ![Available Chocolatey Snippets](https://raw.githubusercontent.com/gep13/chocolatey-vscode/master/images/Choco-Snippets.png)
 
-and then simply arrow up/down to the one you want and press enter, or left mouse click.  From there the PowerShell for the helper function will be generated, and the cursor will be placed ready for you to start filling in the content of function...
+and then simply arrow up/down to the one you want and press enter, or left mouse click.  From there the PowerShell code for the helper function will be generated, and the cursor will be placed ready for you to start filling in the content of function...
 
 ![Expanded Chocolatey Snippet](https://raw.githubusercontent.com/gep13/chocolatey-vscode/master/images/Expanded-Choco-Snippet.png)
 
@@ -79,7 +79,7 @@ The execution of the Chocolatey commands in this extension would not have been p
 
 If you would like to see any other snippet or features added for this VS Code Extension, feel free to raise an [issue](https://github.com/gep13/chocolatey-vscode/issues), and if possible, a follow up pull request.
 
-You can also join in the Gitter Chat [![Join the chat at https://gitter.im/gep13/chocolatey-vscode](https://badges.gitter.im/gep13/chocolatey-vscode.svg)](https://gitter.im/gep13/chocolatey-vscode?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+You can also join in the Gitter Chat [![Join the chat at https://gitter.im/gep13-oss/community](https://badges.gitter.im/gep13-oss/community.svg)](https://gitter.im/gep13-oss/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Releases
 

build.cake

@@ -183,12 +183,15 @@ Task("Create-Chocolatey-Package")
 
 Task("Upload-AppVeyor-Artifacts")
     .IsDependentOn("Package-Extension")
+    .IsDependentOn("Create-Chocolatey-Package")
     .WithCriteria(() => parameters.IsRunningOnAppVeyor)
 .Does(() =>
 {
     var buildResultDir = Directory("./build-results");
     var packageFile = File("chocolatey-vscode-" + parameters.Version.SemVersion + ".vsix");
+    var chocolateyPackageFile = File("_Packages/chocolatey/chocolatey-vscode." + parameters.Version.SemVersion + ".nupkg");
     AppVeyor.UploadArtifact(buildResultDir + packageFile);
+    AppVeyor.UploadArtifact(buildResultDir + chocolateyPackageFile);
 });
 
 Task("Publish-GitHub-Release")
@@ -229,7 +232,10 @@ Task("Publish-Chocolatey-Package")
 .OnError(exception =>
 {
     Information("Publish-Chocolatey-Package Task failed, but continuing with next Task...");
-    publishingError = true;
+    
+    // TODO: Don't fail build if failure to push package to Chocolatey, as this is known to cause
+    // some errors at the minute.  An error can be returned, but the package is pushed correctly
+    // publishingError = true;
 });
 
 Task("Publish-Extension")

build/parameters.cake

@@ -99,15 +99,15 @@ public class BuildParameters
     {
         get
         {
-            return "@/all Version " + Version.SemVersion + " of the Chocolatey VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.chocolatey-vscode.";
+            return "@/all Version " + Version.SemVersion + " of the Chocolatey VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.chocolatey-vscode.  Full release notes: https://github.com/gep13/chocolatey-vscode/releases/tag/" + Version.SemVersion;
         }
     }
 
     public string TwitterMessage
     {
         get
         {
-            return "Version " + Version.SemVersion + " of the Chocolatey VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.chocolatey-vscode.";
+            return "Version " + Version.SemVersion + " of the Chocolatey VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.chocolatey-vscode. @chocolateynuget @code  Full release notes: https://github.com/gep13/chocolatey-vscode/releases/tag/" + Version.SemVersion;
         }
     }
 
@@ -191,9 +191,9 @@ public class BuildParameters
             }.Any(
                 publishTarget => StringComparer.OrdinalIgnoreCase.Equals(publishTarget, target)
             ),
-            SkipGitVersion = StringComparer.OrdinalIgnoreCase.Equals("True", context.EnvironmentVariable("CAKE_SKIP_GITVERSION")),
+            SkipGitVersion = StringComparer.OrdinalIgnoreCase.Equals("True", context.EnvironmentVariable("CHOCOLATEYVSCODE_SKIP_GITVERSION")),
             ChocolateyPackages = context.MakeAbsolute(context.Directory("build-results/_Packages/chocolatey")),
-            WyamRootDirectoryPath = context.MakeAbsolute(context.Environment.WorkingDirectory),
+            WyamRootDirectoryPath = context.MakeAbsolute(context.Directory("docs")),
             WyamPublishDirectoryPath = context.MakeAbsolute(context.Directory("build-results/_PublishedDocumentation")),
             WyamConfigurationFile = context.MakeAbsolute((FilePath)"config.wyam"),
             WyamRecipe = "Docs",

chocolatey/tools/VERIFICATION.txt

@@ -2,7 +2,7 @@ VERIFICATION
 Verification is intended to assist the Chocolatey moderators and community
 in verifying that this package's contents are trustworthy.
 
-This package is being officially supplied by the software author of these scripts (Kim J. Nordmo)
+This package is being officially supplied by the software author of these scripts (Gary Ewan Park, thanks to contributions from Kim J. Nordmo)
 
 The included binary file can be downloaded from our releases page located at
 <https://github.com/gep13/chocolatey-vscode/releases>