diff --git a/.gitignore b/.gitignore
index 6fb917d155d..770e60816f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,8 +30,8 @@ GitExtensionsShellEx/Generated/
 *.opensdf
 *.ipch
 *.iml
-*.VS2015.VC.db
-*.VS2015.sqlite
+*.VC.db
+*.sqlite
 *.aps
 *.bak
 *.[Cc]ache
diff --git a/Build/build.VS2015.debug.cmd b/Build/build.VS2015.debug.cmd
deleted file mode 100644
index 0fdd1eda0db..00000000000
--- a/Build/build.VS2015.debug.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-
-call "%~p0\build.generic.cmd" VS2015 Debug Build
-
diff --git a/Build/build.VS2015.debug.run.cmd b/Build/build.VS2015.debug.run.cmd
deleted file mode 100644
index 86fcb184a89..00000000000
--- a/Build/build.VS2015.debug.run.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-call "%~p0\build.generic.debug.run.cmd" VS2015
diff --git a/Build/build.generic.cmd b/Build/build.generic.cmd
deleted file mode 100644
index b88b7974ed2..00000000000
--- a/Build/build.generic.cmd
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-
-rem
-rem Parameters
-rem   %1: vs_solution_version: VS solution version: VS2012, VS2013, VS2015
-rem   %2: vs_configuration:    VS configuration:    Debug, Release
-rem   %3: vs_target:           target:              Build or Rebuild
-rem
-
-set vs_solution_version=%1
-set vs_configuration=%2
-set vs_target=%3
-
-rem %~p0 = dir to location of this cmd file
-rem cd /d "%~p0"
-
-set msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
-IF %vs_solution_version% == VS2015 SET msbuild="C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"
-
-set project="%~p0\..\GitExtensions.%vs_solution_version%.sln"
-set SkipShellExtRegistration=1
-set EnableNuGetPackageRestore=true
-
-set msbuildparams=/p:Configuration=%vs_configuration% /t:%vs_target% /nologo /v:m
-
-%msbuild% %project% /p:Platform="Any CPU" %msbuildparams%
-IF ERRORLEVEL 1 EXIT /B 1
-
-rem %msbuild% %project% /p:Platform=x86 %msbuildparams%
-rem IF ERRORLEVEL 1 EXIT /B 1
-rem %msbuild% %project% /p:Platform=x64 %msbuildparams%
-rem IF ERRORLEVEL 1 EXIT /B 1
-
diff --git a/Build/build.generic.debug.run.cmd b/Build/build.generic.debug.run.cmd
deleted file mode 100644
index 956baeb976c..00000000000
--- a/Build/build.generic.debug.run.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-call "%~p0\build.generic.cmd" %1 Debug Build
-
-IF %ERRORLEVEL% EQU 0 goto success
-echo BUILD FAILED
-pause
-EXIT /B 1
-
-:success
-echo BUILD SUCCEEDED. Start GitExtensions.exe
-start "" "%~p0\..\GitExtensions\bin\Debug\GitExtensions.exe"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca1c73d75ff..50070e65ea7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,19 +6,17 @@
 * Fork the main repository from [github](http://github.com/gitextensions/gitextensions)
 * Read [Project workflow](https://github.com/gitextensions/gitextensions/wiki/Project-Workflow) and [Coding guide](https://github.com/gitextensions/gitextensions/wiki#coding-guide)
 * Push your changes to your fork
-* Send me a pull request
-
-If you do not want to use github, I also accept mailed patches. Just make sure the patch is send as an attachement and not in the body of the mail.
+* Create a pull request
 
 ## How to debug GitExtensions
 
 The installer is build using WiX. You need to install WiX when you want to build the installer. This can be downloaded here: [http://wixtoolset.org/](http://wixtoolset.org/). If you do not want to build the installer, just open the solution and ignore the warning.
 
-* Open the solution file (GitExtensions.VS2015.sln, or GitExtensions.VS2013.sln, or GitExtensions.VS2012.sln)
+* Open the solution file (GitExtensions.sln)
 * Hit F5 to compile and run GitExtensions
 
 ## How to create the installer
 
 * Download and install WiX [http://wixtoolset.org/](http://wixtoolset.org/)
-* Run Setup\\BuildInstallers.VS2015.cmd, or Setup\\BuildInstallers.VS2013.cmd, or Setup\\BuildInstallers.VS2012.cmd to build the installers
+* Run Setup\\BuildInstallers.cmd to build the installers
 
diff --git a/GitExtSshAskPass/GitExtSshAskPass.VS2015.sln b/GitExtSshAskPass/GitExtSshAskPass.sln
similarity index 100%
rename from GitExtSshAskPass/GitExtSshAskPass.VS2015.sln
rename to GitExtSshAskPass/GitExtSshAskPass.sln
diff --git a/GitExtensions.VS2015.build.cmd b/GitExtensions.VS2015.build.cmd
deleted file mode 100644
index fc48ac77d30..00000000000
--- a/GitExtensions.VS2015.build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-cd Setup
-call BuildInstallers.VS2015.cmd
\ No newline at end of file
diff --git a/GitExtensions.VS2015.sln b/GitExtensions.sln
similarity index 100%
rename from GitExtensions.VS2015.sln
rename to GitExtensions.sln
diff --git a/GitExtensions.VS2015.sln.DotSettings b/GitExtensions.sln.DotSettings
similarity index 100%
rename from GitExtensions.VS2015.sln.DotSettings
rename to GitExtensions.sln.DotSettings
diff --git a/GitExtensionsShellEx/GitExtensionsShellEx.VS2015.sln b/GitExtensionsShellEx/GitExtensionsShellEx.sln
similarity index 100%
rename from GitExtensionsShellEx/GitExtensionsShellEx.VS2015.sln
rename to GitExtensionsShellEx/GitExtensionsShellEx.sln
diff --git a/Setup/BuildGitExtNative.cmd b/Setup/BuildGitExtNative.cmd
index 288be68a7f6..6292917cd4c 100644
--- a/Setup/BuildGitExtNative.cmd
+++ b/Setup/BuildGitExtNative.cmd
@@ -9,8 +9,8 @@ SET BuildType=%2
 IF "%BuildType%"=="" SET BuildType=Rebuild
 
 for /f "tokens=*" %%i in ('hMSBuild.bat -only-path -notamd64') do set msbuild="%%i"
-set projectShellEx=..\GitExtensionsShellEx\GitExtensionsShellEx.VS2015.sln
-set projectSshAskPass=..\GitExtSshAskPass\GitExtSshAskPass.VS2015.sln
+set projectShellEx=..\GitExtensionsShellEx\GitExtensionsShellEx.sln
+set projectSshAskPass=..\GitExtSshAskPass\GitExtSshAskPass.sln
 set SkipShellExtRegistration=1
 set msbuildparams=/p:Configuration=%Configuration% /t:%BuildType% /nologo /v:m
 
diff --git a/Setup/BuildInstallers.VS2017.cmd b/Setup/BuildInstallers.VS2017.cmd
deleted file mode 100644
index ba7d5eb8cfa..00000000000
--- a/Setup/BuildInstallers.VS2017.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-
-cd /d "%~p0"
-
-SET Configuration=%1
-IF "%Configuration%"=="" SET Configuration=Release
-
-for /f "tokens=*" %%i in ('hMSBuild.bat -only-path -notamd64') do set msbuild="%%i"
-set project=..\GitExtensions.VS2015.sln
-set EnableNuGetPackageRestore=true
-..\.nuget\nuget.exe restore %project%
-set msbuildparams=/p:Configuration=%Configuration% /t:restore /t:Rebuild /nologo /v:m
-
-%msbuild% %project% /p:Platform="Any CPU" %msbuildparams%
-IF ERRORLEVEL 1 EXIT /B 1
-
-call BuildGitExtNative.cmd %Configuration% Rebuild
-
-call MakeInstallers.cmd
-IF ERRORLEVEL 1 EXIT /B 1
-
-echo.
-IF "%SKIP_PAUSE%"=="" pause
\ No newline at end of file
diff --git a/Setup/BuildInstallers.VS2015.cmd b/Setup/BuildInstallers.cmd
similarity index 93%
rename from Setup/BuildInstallers.VS2015.cmd
rename to Setup/BuildInstallers.cmd
index b723d6f93b6..4cb152271e3 100644
--- a/Setup/BuildInstallers.VS2015.cmd
+++ b/Setup/BuildInstallers.cmd
@@ -6,7 +6,7 @@ SET Configuration=%1
 IF "%Configuration%"=="" SET Configuration=Release
 
 for /f "tokens=*" %%i in ('hMSBuild.bat -only-path -notamd64') do set msbuild="%%i"
-set project=..\GitExtensions.VS2015.sln
+set project=..\GitExtensions.sln
 set EnableNuGetPackageRestore=true
 ..\.nuget\nuget.exe restore %project%
 set msbuildparams=/p:Configuration=%Configuration% /t:Rebuild /nologo /v:m
diff --git a/Setup/MakePortableArchive.cmd b/Setup/MakePortableArchive.cmd
index cbb8f205531..35e54b59adf 100644
--- a/Setup/MakePortableArchive.cmd
+++ b/Setup/MakePortableArchive.cmd
@@ -2,14 +2,9 @@
 
 cd /d "%~p0"
 
-rem
-rem Update this version number with every release
-rem
-setlocal
-set version=2.51
-
 SET Configuration=%1
 IF "%Configuration%"=="" SET Configuration=Release
+SET version=%2
 if not "%APPVEYOR_BUILD_VERSION%"=="" set version=%APPVEYOR_BUILD_VERSION%
 set normal=GitExtensions-Portable-%version%.zip
 set szip="..\packages\7-Zip.CommandLine.9.20.0\tools\7za"
diff --git a/Setup/README.md b/Setup/README.md
index a3fe813934e..1b243fc0a3b 100644
--- a/Setup/README.md
+++ b/Setup/README.md
@@ -20,6 +20,6 @@ Building installers for Git Extensions
     set_version_to.py -t 2.50 -v 2.50
     ```
 
-5. Run BuildInstallers.VS2015.cmd or BuildInstallers.VS2017.cmd. This will generate two msi installers:
+5. Run BuildInstallers.cmd. This will generate two msi installers:
     * GitExtensions250.msi - the standard install with only Git Extensions
     * GitExtensions250Complete.msi - also includes Git for Windows and KDiff3
\ No newline at end of file
diff --git a/Setup/set_version_to.py b/Setup/set_version_to.py
index ba47a48e170..e8293f2466b 100644
--- a/Setup/set_version_to.py
+++ b/Setup/set_version_to.py
@@ -105,17 +105,6 @@
     outfile = open(filename, "w")
     outfile.writelines(makeInstallers)
     
-    filename = "MakePortableArchive.cmd"
-    makeInstallers = open(filename, "r").readlines()
-    for i in range(len(makeInstallers)):
-        line = makeInstallers[i]
-        if line.find("set version=") == 0:
-            data = line.split('=')
-            data[1] = args.text + '\n'
-            makeInstallers[i] = '='.join(data)
-    outfile = open(filename, "w")
-    outfile.writelines(makeInstallers)
-
     filename = "..\GitExtensionsDoc\source\conf.py"
     docoConf = open(filename, "r").readlines()
     for i in range(len(docoConf)):
diff --git a/appveyor.yml b/appveyor.yml
index 9c46a54378e..64638abbfc7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: 2.50.90.{build}
 
-os: Visual Studio 2015
+os: Visual Studio 2017
 
 branches:
   except:
@@ -9,8 +9,7 @@ branches:
 
 environment:
   matrix:
-  - IdeVersion: VS2015
-  #- IdeVersion: Mono
+  - IdeVersion: VS2017
   SKIP_PAUSE: TRUE
   ARCHIVE_WITH_PDB: TRUE
 
@@ -32,8 +31,8 @@ install:
 build_script:
 - ps: |
     Write-Output "Platform: $env:IdeVersion"
-    & Setup\BuildInstallers.$env:IdeVersion.cmd
+    & Setup\BuildInstallers.cmd
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-    & Setup\MakePortableArchive.cmd
+    & Setup\MakePortableArchive.cmd Release %APPVEYOR_BUILD_VERSION%
     #Upload a portable archive, not a installer
     Get-ChildItem Setup\GitExtensions-Portable-*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }