Merge branch 'next' of https://github.com/shadowofsilicon/Rubberduck into next

Author: shadowofsilicon

RetailCoder.VBE/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.*")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.*")]
+//[assembly: AssemblyFileVersion("2.1.0.0")]

appveyor.yml

@@ -1,4 +1,13 @@
-version: 2.1.{build}
+version: 2.1.0
+for:
+-
+  branches:
+    only:
+      - next
+  version: 2.1.0.{build}
+  after_test:
+  - cmd: iscc /q "Installer Build Script.iss" 
+  - cmd: move Installers\Rubberduck.Setup.exe Installers\Rubberduck.Setup.%APPVEYOR_BUILD_VERSION%-pre.exe
 branches:
   only:
   - master
@@ -15,40 +24,43 @@ before_build:
 - ps: choco install innosetup
 build:
   verbosity: normal
-artifacts:
-- path: Installers\Rubberduck.Setup.exe
-  name: Rubberduck
+assembly_info:
+  patch: true
+  file: RetailCoder.VBE\Properties\AssemblyInfo.cs
+  assembly_version: '{version}'
 hosts:
   api.nuget.org: 93.184.221.200
-after_test:
-- iscc /q "Installer Build Script.iss"  
 before_package:
 - cmd: copy Rubberduck.Inspections\bin\Release\Rubberduck.Inspections.dll RetailCoder.VBE\bin\Release\Rubberduck.Inspections.dll
-before_deploy:
-- ps: 
+after_test:
+- iscc /q "Installer Build Script.iss" 
+- cmd: move Installers\Rubberduck.Setup.exe Installers\Rubberduck.Setup.%APPVEYOR_BUILD_VERSION%.exe
+artifacts:
+- path: Installers\Rubberduck.Setup.*.exe
+  name: Rubberduck
 deploy:
 - provider: GitHub
   tag: Rubberduck v$(appveyor_build_version)
   release: Rubberduck v$(appveyor_build_version)
-  description: AppVeyor build on [next] - https://ci.appveyor.com/project/retailcoder/rubberduck/build/$(appveyor_build_version)
+  description: AppVeyor build on [master] - https://ci.appveyor.com/project/retailcoder/rubberduck/build/$(appveyor_build_version)
   auth_token:
     secure: oh0SRnZVt0ABeWqFr7ut5TZkxFJjHmS/DZnJnp2HErQTCmX3O8RASJH3ZiYl11gz
-  artifact: Installers\Rubberduck.Setup.exe
-  draft: false
-  prerelease: true
+  artifact: Installers\Rubberduck.Setup.$(appveyor_build_version).exe
+  draft: true
+  prerelease: false
   on:
-    branch: next
+    branch: master
 - provider: GitHub
   tag: Rubberduck v$(appveyor_build_version)
-  release: Rubberduck v$(appveyor_build_version)
-  description: AppVeyor build on [master] - https://ci.appveyor.com/project/retailcoder/rubberduck/build/$(appveyor_build_version)
+  release: Rubberduck v$(appveyor_build_version)-pre
+  description: AppVeyor build on [next] - https://ci.appveyor.com/project/retailcoder/rubberduck/build/$(appveyor_build_version)
   auth_token:
     secure: oh0SRnZVt0ABeWqFr7ut5TZkxFJjHmS/DZnJnp2HErQTCmX3O8RASJH3ZiYl11gz
-  artifact: Installers\Rubberduck.Setup.exe
-  draft: true
-  prerelease: false
+  artifact: Installers\Rubberduck.Setup.$(appveyor_build_version)-pre.exe
+  draft: false
+  prerelease: true
   on:
-    branch: master
+    branch: next
 notifications:
 - provider: Webhook
   url: http://stats.zomis.net/GithubHookSEChatService/hooks/github/payload?roomId=14929