Merge branch 'feature/issue100' into develop

Author: SlavaRa

QuickNavigate.Tests/QuickNavigate.Tests.csproj

@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

QuickNavigate.sln

@@ -15,16 +15,16 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{36B91299-9080-4052-839D-74166B18DD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B91299-9080-4052-839D-74166B18DD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B91299-9080-4052-839D-74166B18DD24}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{36B91299-9080-4052-839D-74166B18DD24}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{36B91299-9080-4052-839D-74166B18DD24}.Debug|x86.ActiveCfg = Debug|x86
 		{36B91299-9080-4052-839D-74166B18DD24}.Debug|x86.Build.0 = Debug|x86
 		{36B91299-9080-4052-839D-74166B18DD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36B91299-9080-4052-839D-74166B18DD24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{36B91299-9080-4052-839D-74166B18DD24}.Release|x86.ActiveCfg = Release|x86
 		{36B91299-9080-4052-839D-74166B18DD24}.Release|x86.Build.0 = Release|x86
-		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C5E9EAE-6168-473D-8FDE-E1C7C84FE04B}.Release|Any CPU.Build.0 = Release|Any CPU

QuickNavigate/QuickNavigate.csproj

@@ -39,13 +39,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputPath>..\..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputPath>..\..\..\..\FlashDevelop\Bin\Release\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>

appveyor.yml

@@ -1,46 +1,41 @@
+os: Visual Studio 2015
 environment:
   PLUGIN_VERSION: 2.7
   PLUGIN_NAME: QuickNavigate
   PLUGIN_DESC: Quickly navigate through Types, Fields, Projects and more
   PLUGIN_PATH: C:\projects\FlashDevelop\External\Plugins\QuickNavigate
+  PLUGIN_DLL:  C:\projects\FlashDevelop\FlashDevelop\Bin\Release\Plugins\QuickNavigate.dll
   PLUGIN_INFO: http:\/\/www.flashdevelop.org\/community\/viewtopic.php?f=4&t=5961
   PLUGIN_GITHUB_RELEASES: https:\/\/github.com\/SlavaRa\/fdplugin-quicknavigate\/releases
-  APPMAN_TEMPLATE: appman.template
+  APPMAN_TEMPLATE: C:\projects\FlashDevelop\External\Plugins\QuickNavigate\appman.template
   APPMAN_CONFIG_XML: appman.txt
-init:
-- git clone -q https://github.com/fdorg/flashdevelop.git C:\projects\FlashDevelop
-version: $(PLUGIN_VERSION).{build}
-platform:
-- x86
-configuration:
-- Release
-os: Visual Studio 2015
-skip_tags: true
 install:
 - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+version: $(PLUGIN_VERSION).{build}
+skip_tags: true
+init:
+- git clone -q --branch=master https://github.com/fdorg/flashdevelop.git C:\projects\FlashDevelop
 matrix:
   fast_finish: true
 before_build:
-- cd ..
+build: off
+build_script:
+- cd c:\
 - mv %APPVEYOR_BUILD_FOLDER% %PLUGIN_PATH%
 - nuget restore %PLUGIN_PATH%\%PLUGIN_NAME%.sln
-build:
-  project: $(PLUGIN_PATH)\$(PLUGIN_NAME).sln
+- msbuild /p:Configuration=Release /p:Platform="Any CPU" /v:m %PLUGIN_PATH%\%PLUGIN_NAME%.sln
 after_build:
 - mkdir %APPVEYOR_BUILD_FOLDER%\$(BaseDir)\Plugins
-- mv C:\projects\FlashDevelop\FlashDevelop\Bin\Release\Plugins\%PLUGIN_NAME%.dll %APPVEYOR_BUILD_FOLDER%\$(BaseDir)\Plugins\%PLUGIN_NAME%.dll
+- mv %PLUGIN_DLL% %APPVEYOR_BUILD_FOLDER%\$(BaseDir)\Plugins\%PLUGIN_NAME%.dll
 - cd %APPVEYOR_BUILD_FOLDER%
 - 7z a %PLUGIN_NAME%.zip $(BaseDir)\
 - mv %PLUGIN_NAME%.zip %PLUGIN_NAME%.fdz
-- cd %PLUGIN_PATH%
-- md5sum %APPVEYOR_BUILD_FOLDER%\%PLUGIN_NAME%.fdz > checksum.md5
-- cat checksum.md5
+- rm -rf %APPVEYOR_BUILD_FOLDER%\$(BaseDir)
+- md5sum %PLUGIN_NAME%.fdz > checksum.md5
 - sed -e "s/.//" checksum.md5 > checksum.tmp.md5 && mv checksum.tmp.md5 checksum.md5
-- cat checksum.md5
 - sed -e "s/ .*//" checksum.md5 > checksum.tmp.md5 && mv checksum.tmp.md5 checksum.md5
-- cat checksum.md5
 - set /p CHECKSUM=<checksum.md5
-- echo %CHECKSUM%
+- rm checksum.md5
 - mv %APPMAN_TEMPLATE% %APPMAN_CONFIG_XML%
 - sed -i -e s/_ID_/quicknavigate/g %APPMAN_CONFIG_XML%
 - sed -i -e "s/_NAME_/%PLUGIN_NAME%/g" %APPMAN_CONFIG_XML%
@@ -50,7 +45,6 @@ after_build:
 - sed -i -e "s/_INFO_/%PLUGIN_INFO%/g" %APPMAN_CONFIG_XML%
 - sed -i -e "s/_URL_/%PLUGIN_GITHUB_RELEASES%\/download\/%APPVEYOR_BUILD_VERSION%\/%PLUGIN_NAME%.fdz/g" %APPMAN_CONFIG_XML%
 - sed -i -e "s/_CHECKSUM_/%CHECKSUM%/g" %APPMAN_CONFIG_XML%
-- mv %APPMAN_CONFIG_XML% %APPVEYOR_BUILD_FOLDER%\%APPMAN_CONFIG_XML%
 artifacts:
 - path: $(PLUGIN_NAME).fdz
   name: $(PLUGIN_NAME)