Merge remote-tracking branch 'upstream/master' into timetable-window2

Author: Chris Jakeman

.appveyor.yml

@@ -1,20 +1,27 @@
 version: AV1.3.1-{build}
 skip_branch_with_pr: true
 image: Visual Studio 2017
+cache:
+  - C:\ProgramData\chocolatey\bin -> .appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> .appveyor.yml
+  - C:\lazarus -> .appveyor.yml
+  - C:\Program Files (x86)\Common Files\Microsoft Shared\XNA -> .appveyor.yml
+  - C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework -> .appveyor.yml
+  - C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework.Game -> .appveyor.yml
 install:
 - ps: >-
     $ErrorActionPreference = "Stop"
 
-    choco install --yes --no-progress lazarus 7zip.portable xna31
+    choco install --yes --no-progress lazarus 7zip.portable xunit xna31
 
     if ($LASTEXITCODE -ne 0) { throw "Chocolatey failed to install all required packages - use the 're-build' option to try again" }
 
     (New-Object Net.WebClient).DownloadFile('https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x86.exe', 'rcedit-x86.exe')
 
-    $env:PATH="$env:PATH;C:\lazarus;$((Get-ChildItem -Recurse C:\lazarus\fpc\strip.exe).DirectoryName);C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin"
+    $env:PATH="C:\ProgramData\chocolatey\bin;$env:PATH;C:\lazarus;$((Get-ChildItem -Recurse C:\lazarus\fpc\strip.exe).DirectoryName);C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin"
 build_script:
 - cmd: Build.cmd unstable
 test: off
-artifacts:
-- path: OpenRails-Unstable.zip
-- path: OpenRails-Unstable-Source.zip
+# artifacts:
+# - path: OpenRails-Unstable.zip
+# - path: OpenRails-Unstable-Source.zip

.gitignore

@@ -359,4 +359,4 @@ ASALocalRun/
 healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
+MigrationBackup/

Build.cmd

@@ -133,7 +133,7 @@ REM Build locales.
 PUSHD Source\Locales && CALL Update.bat non-interactive && POPD || GOTO :error
 
 REM Run unit tests (9009 means XUnit itself wasn't found, which is an error).
-xunit.console.x86 Program\Tests.dll /nunit xunit.xml
+xunit.console.x86 Program\Tests.dll -nunit xunit.xml
 IF "%ERRORLEVEL%" == "9009" GOTO :error
 
 CALL :copy "Program\RunActivity.exe" "Program\RunActivityLAA.exe" || GOTO :error

CONTRIBUTING.md

@@ -81,6 +81,14 @@ If you are in any doubt about the use of data by multiple threads, or your imple
 
 Your code should be fixing exactly one bug or adding a single new feature; mixing multiple bug fixes or new features makes it harder to review your changes and risks them not being accepted.
 
+### Testing and Unstable Versions
+
+Changes to the Git "master" branch are selected by peer review and the branch is automatically published as the "Testing Version" every Friday.
+Changes to the Git "unstable" branch are automatically selected and published as the "Unstable Version" every 15 minutes.
+Your changes should always start from the "master" branch and not the "unstable" branch.
+
+### Submitting your code
+
 When you're done writing code, you should make a pull request on GitHub or a merge request on Launchpad. The title and description of the requests should clearly and concisely indicate what bug or feature you've implemented and you will need to include links to whichever of the following are appropriate:
 
 * Bug report