Update appveyor.yml and README.md

README.md

@@ -23,10 +23,10 @@ The configuration file SurroundSelection.ini provides additional characters to s
 to use `*`, `-` and `_` to act as surround characters as the above examples do.
 
 ## Installation
-Install the plugin by downloading it from the [Release](https://github.com/dail8859/SurroundSelection/releases) page and copy `SurroundSelection.dll` to your `plugins` folder. You can also install it via the Plugin Admin or Plugin Manager (depending on your Notepad++ version).
 
+Use the built in Plugin Admin to automatically install the plugin.
 ## Development
-The code has been developed using MSVC 2015. Building the code will generate the DLL which can be used by Notepad++. For convenience, MSVC copies the DLL into the Notepad++ plugin directory.
+The code has been developed using Visual Studio 2017. Building the code will generate the DLL which can be used by Notepad++. For convenience, MSVC copies the DLL into the Notepad++ plugin directory.
 
 ## License
 This code is released under the [GNU General Public License version 2](http://www.gnu.org/licenses/gpl-2.0.txt).

appveyor.yml

@@ -1,56 +1,63 @@
 version: 1.2.0.{build}
-image: Visual Studio 2015
+image: Visual Studio 2017
 
 platform:
-    - x64
-    - Win32
+  - x64
+  - Win32
 
 configuration:
-    - Release
-    - Debug
+  - Release
+  - Debug
 
 install:
-    - if "%platform%"=="x64" set archi=amd64
-    - if "%platform%"=="Win32" set archi=x86
-    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+  - if "%platform%"=="x64" set archi=amd64
+  - if "%platform%"=="x64" set build_platform=x64
+
+  - if "%platform%"=="Win32" set archi=x86
+  - if "%platform%"=="Win32" set build_platform=Win32
+
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
 
 build:
-    parallel: true
-    verbosity: minimal
+  parallel: true
+  verbosity: minimal
 
 build_script:
-    - cd "%APPVEYOR_BUILD_FOLDER%"
-    - msbuild SurroundSelection.sln /p:configuration="%configuration%" /p:platform="%platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - cd "%APPVEYOR_BUILD_FOLDER%"
+  - msbuild SurroundSelection.sln /p:Configuration="%configuration%" /p:Platform="%build_platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 after_build:
-    - cd "%APPVEYOR_BUILD_FOLDER%"
-    - ps: >-
-
-        Push-AppveyorArtifact "bin\$($env:CONFIGURATION)_$($env:PLATFORM)\SurroundSelection.dll" -FileName SurroundSelection.dll
-
-        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
-            if ($env:PLATFORM -eq "x64"){
-                $ZipFileName = "SurroundSelection_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
-                7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:PLATFORM)\*.dll"
-            }
-            if ($env:PLATFORM -eq "Win32"){
-                $ZipFileName = "SurroundSelection_$($env:APPVEYOR_REPO_TAG_NAME).zip"
-                7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:PLATFORM)\*.dll"
-            }
+  - cd "%APPVEYOR_BUILD_FOLDER%"
+  - ps: >-
+
+      $BuildPath = "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:BUILD_PLATFORM)"
+
+      Push-AppveyorArtifact "$($BuildPath)\SurroundSelection.dll" -FileName SurroundSelection.dll
+
+      if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
+        mkdir SurroundSelection
+        Move-Item -Path "$($BuildPath)\SurroundSelection.dll" -Destination .\SurroundSelection
+        if ($env:BUILD_PLATFORM -eq "x64"){
+          $ZipFileName = "SurroundSelection_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
+        }
+        if ($env:BUILD_PLATFORM -eq "Win32"){
+          $ZipFileName = "SurroundSelection_$($env:APPVEYOR_REPO_TAG_NAME).zip"
         }
+        7z a $ZipFileName .\SurroundSelection
+      }
 
 artifacts:
   - path: SurroundSelection*.zip
     name: releases
 
 deploy:
-    provider: GitHub
-    auth_token:
-        secure: qrw+nu8dQKFLG+lNmky6buHsvHFwlibAai0r0aJ3MYbyBniONVxvgnmyx37bPh44
-    artifact: releases
-    draft: true
-    prerelease: false
-    force_update: true
-    on:
-        appveyor_repo_tag: true
-        configuration: Release
+  provider: GitHub
+  auth_token:
+    secure: qrw+nu8dQKFLG+lNmky6buHsvHFwlibAai0r0aJ3MYbyBniONVxvgnmyx37bPh44
+  artifact: releases
+  draft: true
+  prerelease: false
+  force_update: true
+  on:
+    appveyor_repo_tag: true
+    configuration: Release