Merge branch 'dev' into syntax

Author: vors

appveyor.yml

@@ -1,22 +1,24 @@
+environment:
+  global:
+    PACKAGE: "PowerShell"
+  matrix:
+    - SUBLIME_TEXT_VERSION: "3"
+
 install:
-  - ps: write-host -ForegroundColor Yellow "installing sublime text 3"
-  - ps: start-filedownload "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20Build%203059%20x64.zip"
-  - ps: 7z.exe x "Sublime%20Text%20Build%203059%20x64.zip" -o"C:\st" > $null
-  - ps: write-host -ForegroundColor Yellow "copying PowerShell package"
-  - ps: mkdir "C:\st\Data\Packages" -force > $null
-  - ps: mkdir "C:\st\Data\Packages\PowerShell" -force > $null
-  - ps: cp -Recurse * "C:\st\Data\Packages\PowerShell" -Force
-  - ps: write-host -ForegroundColor Yellow "installing UnitTesting package"
-  - ps: git clone -q --branch=master https://github.com/randy3k/UnitTesting.git "C:\st\Data\Packages\UnitTesting"
-  - ps: write-host -ForegroundColor Yellow "installing pester"
-  - ps: cinst pester
+  - ps: |
+      write-host -ForegroundColor Yellow "Installing Sublime Text 3..."
+      start-filedownload "https://raw.githubusercontent.com/randy3k/UnitTesting/master/sbin/appveyor.ps1"
+      .\appveyor.ps1 "bootstrap" -verbose
+      write-host -ForegroundColor Yellow "Installing pester..."
+      cinst pester
 
-build: false
+build: off
 
 test_script:
-  - ps: write-host -ForegroundColor Yellow "Run python tests"  
-  - ps: C:\st\Data\Packages\UnitTesting\sbin\run.ps1 "PowerShell"
-  - ps: write-host -ForegroundColor Yellow "Run pester tests"  
-  - ps: $res = Invoke-Pester -OutputFormat NUnitXml -OutputFile TestsResults.xml -PassThru
-  - ps: (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestsResults.xml))
-  - ps: if ($res.FailedCount -gt 0) { throw "$($res.FailedCount) tests failed."}
+  - ps: |
+      write-host -ForegroundColor Yellow "Run python tests..."
+      .\appveyor.ps1 "run_tests" -verbose
+      write-host -ForegroundColor Yellow "Run pester tests..."
+      $res = Invoke-Pester -OutputFormat NUnitXml -OutputFile TestsResults.xml -PassThru
+      (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestsResults.xml))
+      if ($res.FailedCount -gt 0) { throw "$($res.FailedCount) tests failed."}

messages.json

@@ -0,0 +1,3 @@
+{
+	"2.x": "messages/2.x.txt"
+}