From a095b2edbba37e4e4234666e31827ed73aa75582 Mon Sep 17 00:00:00 2001
From: Roman Kurbangaliyev <roman.kurbangaliev@gmail.com>
Date: Fri, 19 May 2017 23:03:26 +0300
Subject: [PATCH] Release version 2.0.0

---
 RegexTester/Common/RegexProcessContext.cs     |   1 -
 RegexTester/Key.snk                           | Bin 596 -> 0 bytes
 RegexTester/Properties/AssemblyInfo.cs        |   8 +-
 RegexTester/RegexTester.csproj                | 201 ++++++++++++------
 RegexTester/RegexTester.sln                   |   4 +-
 RegexTester/Resources/Resources.Designer.cs   |   2 +-
 RegexTester/UserControls/RegexTesterMain.xaml |   4 +-
 RegexTester/UserControls/RegexTesterPage.xaml |   6 +-
 RegexTester/app.config                        |  15 ++
 RegexTester/changes.txt                       |  25 +++
 RegexTester/license.txt                       |   2 +-
 RegexTester/packages.config                   |  30 +++
 RegexTester/sign-key-file.pfx                 | Bin 0 -> 1709 bytes
 RegexTester/source.extension.vsixmanifest     |  63 ++----
 14 files changed, 238 insertions(+), 123 deletions(-)
 delete mode 100644 RegexTester/Key.snk
 create mode 100644 RegexTester/app.config
 create mode 100644 RegexTester/changes.txt
 create mode 100644 RegexTester/packages.config
 create mode 100644 RegexTester/sign-key-file.pfx

diff --git a/RegexTester/Common/RegexProcessContext.cs b/RegexTester/Common/RegexProcessContext.cs
index 1cd7b9e..c269345 100644
--- a/RegexTester/Common/RegexProcessContext.cs
+++ b/RegexTester/Common/RegexProcessContext.cs
@@ -8,7 +8,6 @@ namespace Sharomank.RegexTester.Common
     /// </summary>
     public class RegexProcessContext
     {
-        private string _replaceRegexPattern;
         private Regex _matchRegex;
 
         public string MatchRegexExpression { get; private set; }
diff --git a/RegexTester/Key.snk b/RegexTester/Key.snk
deleted file mode 100644
index ab8802f4ae790a40e932a46a4e387f8d923a61c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098WHdBa;#4n;}><nr{T-T(JSQNUasxPjw
zhfYro1X*S~PU^wcd4l9K=&S;pM^BR2hFnbpP#=q0T4`1(AM}gpUul^2c%WHv8@rPC
zxxXek!KwypwS2Sys|m$5+Vk!|cjD2=!Ii_kwDrE>H0X@y{17OHk9Q8-&kzOnae1wq
zg+`O^LlFEywqo99&?*}<n#6;B{y9#^bi`5Sb#{`7K_U(?6v$<^+dwb-zP`>smPTU?
zRz$!zA_F*qiyZQ6jd`?Ca?Rw>o!mW+aji%pQ+~?Fs}B~}e8crN>#>A|e*>HxWMlSW
zL=)n&P<d)L-6J|btZ{}>sw6*V^K7@LKP)~zHKI<kT5L#Bc(cIRbShjFN9<w~aiKVb
zvw#)@By70yGVE3Ihhhcy*)bMBI@W%`OROpar+z;H__?DiPPEz`=UKfKOOg+E__Q+v
zXW1~I4H4t`kRZC-bk2I4*;^1IXy>T}qG)ai2H*-4wvdA@Gr_l8a&%j_yDus#c8Qed
z3TXl=WZQ2ZiLMhRuAWPv0hx;UXkccuU|Ovy3>PV?{bh!RnTEm_5J%#tyyY)kyZhWT
zmRXabq>Dt2ExH8WTPSvma;-D=5FBD6(`v`}D|-2P_J*k4UW;gdx~>=~Axz01=6woK
ziE1>ql_lqPW0+AKsd!9*%b4vnwv<e;2^@nbfBL`X))M7zrH({m0k7^w@|v0J|5#<n
iLqCT$6GY|jcJnN1!&?EUZx$Hq&Q;17o4coW6CSBbxfeqK

diff --git a/RegexTester/Properties/AssemblyInfo.cs b/RegexTester/Properties/AssemblyInfo.cs
index d389b55..3ebeedb 100644
--- a/RegexTester/Properties/AssemblyInfo.cs
+++ b/RegexTester/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Regex Tester")]
-[assembly: AssemblyDescription("Regular Expression Tester for Visual Studio 2010-2015.")]
+[assembly: AssemblyDescription("Regular Expression Tester for Visual Studio 2017.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Roman Kurbangaliyev")]
 [assembly: AssemblyProduct("Regex Tester")]
-[assembly: AssemblyCopyright("Copyright © Roman Kurbangaliyev 2015")]
+[assembly: AssemblyCopyright("Copyright © Roman Kurbangaliyev 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]   
 [assembly: ComVisible(false)]     
@@ -28,8 +28,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 
 
 
diff --git a/RegexTester/RegexTester.csproj b/RegexTester/RegexTester.csproj
index 20e27bc..dfe74dd 100644
--- a/RegexTester/RegexTester.csproj
+++ b/RegexTester/RegexTester.csproj
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <PublishUrl>publish\</PublishUrl>
@@ -18,6 +19,12 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <Ngen>true</Ngen>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>source.extension.vsixmanifest</ApplicationManifest>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -30,15 +37,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sharomank.RegexTester</RootNamespace>
     <AssemblyName>RegexTester</AssemblyName>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>sign-key-file.pfx</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>12.0</OldToolsVersion>
+    <OldToolsVersion>14.0</OldToolsVersion>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
   </PropertyGroup>
@@ -63,22 +70,112 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\EnvDTE100.10.0.1\lib\net20\EnvDTE100.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\EnvDTE90.9.0.1\lib\net10\EnvDTE90.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EnvDTE90a, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\EnvDTE90a.9.0.1\lib\net10\EnvDTE90a.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.10.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\Microsoft.VisualStudio.Shell.10.0.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.15.0.15.0.26201\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.15.0.26201\lib\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -92,51 +189,6 @@
     <Reference Include="System.Xaml" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE100">
-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
-      <VersionMajor>10</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE90">
-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.VisualStudio.CommandBars">
-      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
@@ -195,9 +247,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="sign-key-file.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
@@ -209,10 +261,15 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="changes.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <Content Include="Resources\Images_32bit.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <None Include="source.extension.vsixmanifest" />
     <None Include="Resources\Images_24bit.bmp" />
   </ItemGroup>
   <ItemGroup>
@@ -283,6 +340,16 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('packages\VsixUpdater.1.0.28\build\VsixUpdater.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\VsixUpdater.1.0.28\build\VsixUpdater.targets'))" />
+  </Target>
+  <Import Project="packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="packages\VsixUpdater.1.0.28\build\VsixUpdater.targets" Condition="Exists('packages\VsixUpdater.1.0.28\build\VsixUpdater.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/RegexTester/RegexTester.sln b/RegexTester/RegexTester.sln
index 5e3f965..d00c2ad 100644
--- a/RegexTester/RegexTester.sln
+++ b/RegexTester/RegexTester.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22310.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegexTester", "RegexTester.csproj", "{472CA577-C4D4-4C2E-BE98-FE1424D4656B}"
 EndProject
diff --git a/RegexTester/Resources/Resources.Designer.cs b/RegexTester/Resources/Resources.Designer.cs
index d25ebc3..ed853d3 100644
--- a/RegexTester/Resources/Resources.Designer.cs
+++ b/RegexTester/Resources/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/RegexTester/UserControls/RegexTesterMain.xaml b/RegexTester/UserControls/RegexTesterMain.xaml
index d7a41ef..4acbd33 100644
--- a/RegexTester/UserControls/RegexTesterMain.xaml
+++ b/RegexTester/UserControls/RegexTesterMain.xaml
@@ -10,11 +10,11 @@
     <TabControl Name="MainTabControl" SelectionChanged="MainTabControl_SelectionChanged">
         <TabControl.ContextMenu>
             <ContextMenu>
-                <MenuItem Name="MenuItem_CloseTab"  Header="Close Tab" InputGestureText="Ctrl + Shift + W" Click="MenuItem_CloseTab_Click"/>
+                <MenuItem Name="MenuItem_CloseTab"  Header="Close Tab" InputGestureText="Ctrl+Shift+W" Click="MenuItem_CloseTab_Click"/>
                 <MenuItem Name="MenuItem_CloseOtherTabs" Header="Close Others Tabs" Click="MenuItem_CloseOtherTabs_Click" />
                 <MenuItem Name="MenuItem_CloseAllTabs" Header="Close All Tabs" Click="MenuItem_CloseAllTabs_Click" />
                 <Separator />
-                <MenuItem Name="MenuItem_NewTab" Header="New Tab" InputGestureText="Ctrl + T" Click="MenuItem_NewTab_Click" />
+                <MenuItem Name="MenuItem_NewTab" Header="New Tab" InputGestureText="Ctrl+Shift+T" Click="MenuItem_NewTab_Click" />
             </ContextMenu>
         </TabControl.ContextMenu>
         <TabItem Header="+" Name="tabItemCreator" ToolTip="New Tab" FontWeight="Normal" FontSize="12" IsSelected="False" />
diff --git a/RegexTester/UserControls/RegexTesterPage.xaml b/RegexTester/UserControls/RegexTesterPage.xaml
index 44706f7..81dba0e 100644
--- a/RegexTester/UserControls/RegexTesterPage.xaml
+++ b/RegexTester/UserControls/RegexTesterPage.xaml
@@ -102,9 +102,9 @@
             </StackPanel>
 
             <StackPanel Orientation="Horizontal" Grid.Column="2">
-                <CheckBox Name="cbAutorun" IsChecked="{Binding Autorun, Mode=TwoWay}" Style="{StaticResource toggleCheckBox}" ToolTip="Ctrl + Shift + A">AUTORUN</CheckBox>
+                <CheckBox Name="cbAutorun" IsChecked="{Binding Autorun, Mode=TwoWay}" Style="{StaticResource toggleCheckBox}" ToolTip="Ctrl+Shift+A">AUTORUN</CheckBox>
                 <CheckBox Name="cbOptimize" IsChecked="{Binding Optimize, Mode=TwoWay}" Style="{StaticResource toggleCheckBox}" ToolTip="OPTIMIZE mode shows only first 1000 chars and add warning in the end of output data." Click="CheckBox_Click">OPTIMIZE</CheckBox>
-                <Button Name="btnCommandSave" Tag="command-save" Style="{StaticResource commandButton}" ToolTip="Save (Ctrl + S)" Click="btnCommand_Click">
+                <Button Name="btnCommandSave" Tag="command-save" Style="{StaticResource commandButton}" ToolTip="Save (Ctrl+S)" Click="btnCommand_Click">
                     <Image Stretch="None" Source="..\Resources\commands\save.png" />
                 </Button>
             </StackPanel>
@@ -129,7 +129,7 @@
                 <TextBlock Name="tblockInputReplace" VerticalAlignment="Center" FontWeight="Bold" Foreground="Black" Grid.Row="1" Text="Replacement format: " />
                 <RichTextBox Name="rtbInputReplace" Grid.Column="1" Grid.Row="1" Padding="2" Margin="2" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" ToolTip="Use ${groupname} format to get its value. The default group name is 1, 2, 3... etc. (if it wasn't set any other group name)." FontSize="16" Block.LineHeight="2" TextChanged="TextChangedAutoRunEventHandler"/>
 
-                <Button Name="btnMatch" Grid.Column="2" Grid.RowSpan="2" IsDefault="True" Margin="2" Padding="5 3" ToolTip="Ctrl + P" Click="btnMatch_Click">RUN</Button>
+                <Button Name="btnMatch" Grid.Column="2" Grid.RowSpan="2" IsDefault="True" Margin="2" Padding="5 3" ToolTip="Ctrl+P" Click="btnMatch_Click">RUN</Button>
 
                 <WrapPanel Grid.Row="2" Grid.ColumnSpan="3" Orientation="Horizontal">
                     <CheckBox Name="cbMultiline"
diff --git a/RegexTester/app.config b/RegexTester/app.config
new file mode 100644
index 0000000..a94084f
--- /dev/null
+++ b/RegexTester/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/RegexTester/changes.txt b/RegexTester/changes.txt
new file mode 100644
index 0000000..408fa33
--- /dev/null
+++ b/RegexTester/changes.txt
@@ -0,0 +1,25 @@
+Version 2.0.0 - May 3, 2017:
+- Migration to Visual Studio 2017.
+NOTE: Old releases are available on GitHub here: https://github.com/sharomank/regex-tester/releases
+
+Version 1.5.2 - Jul 30, 2015:
+- Improve regex parsing when regular expression is changing (issue #7).
+
+Version 1.5.1 - Feb 23, 2015:
+- Autorun triggered on changing the input text.
+
+Version 1.5.0 - Feb 19, 2015:
+- Added support for Visual Studio 2015 and fixed problem regex replacement & code generation, now instead of the square brackets need touse curly brackets.
+
+Version 1.4.2 - Aug 21, 2013:
+- Added support for Visual Studio 2013.
+
+Old Versions:
+1.4.1 - Fixed support for Visual Studio 2010.
+1.4.0 - Added feature "Output mode", you can generate C# samples for yours regex.
+1.3.2 - Added command "Save", code refactoring and UI changes.
+1.3.1 - Unification UI styles and fixed some problem.
+1.3.0 - Added support for Visual Studio 2012.
+1.2.0 - Refactoring: new optimization mode (auto use at test large data),improvement performance, small update UI and fixed some problem.
+1.1.0 - Added features: autorun, multitabs, async optimization, hotkeys and etc.
+1.0.0 - Initial release.
\ No newline at end of file
diff --git a/RegexTester/license.txt b/RegexTester/license.txt
index c9b9b75..09ed76d 100644
--- a/RegexTester/license.txt
+++ b/RegexTester/license.txt
@@ -1,4 +1,4 @@
-Copyright [2015] [Roman Kurbangaliyev]
+Copyright [2017] [Roman Kurbangaliyev]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/RegexTester/packages.config b/RegexTester/packages.config
new file mode 100644
index 0000000..ff803f8
--- /dev/null
+++ b/RegexTester/packages.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EnvDTE" version="8.0.1" targetFramework="net46" />
+  <package id="EnvDTE100" version="10.0.1" targetFramework="net46" />
+  <package id="EnvDTE80" version="8.0.1" targetFramework="net46" />
+  <package id="EnvDTE90" version="9.0.1" targetFramework="net46" />
+  <package id="EnvDTE90a" version="9.0.1" targetFramework="net46" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Imaging" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Threading" version="15.0.240" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Validation" version="15.0.82" targetFramework="net46" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net46" developmentDependency="true" />
+  <package id="stdole" version="7.0.3301" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/RegexTester/sign-key-file.pfx b/RegexTester/sign-key-file.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..75b99dbf2e88e2a704b4c818ef88ccc8412dc1f1
GIT binary patch
literal 1709
zcmcIldo+}37=OQ+@remj>vG0@h~(0KL&GGICbz{Pn_I3)Otxs45z?A**+b+Kii(kP
z>l8K=)@4db<Px=6+7hBD<&yTq+LyCy+jI8M-SeI2JJ0X;JiqsS-tYT<=fn7D84kf?
zd^7+R(@wNbT#!IS5dj}{A@I??kY-|heC<C<_!0siUj*p_80S&qpQ`oZ2u{Gq)na_y
zkC-AV{ud1wmn5tsbMhb6PyUMFaH2f~J}zCmQA+i!=hPCyBzBEWoN`uW#d%lwi@elk
zE0ymrWj`=4{mvxG#L7rdICn=jR!e9uJH-CYaOzBAu)49<+~#A~%UeVS((m{kUyS%^
zu(R;!E^EBW*Tbr2oW?Fk1@f`(QxsimP1XWJqA=dY#`6l|i>7Aulj7_*nSWxXmML2?
zqRDPQziC&uZ?KrZJZp9Pbnazi9?g~PKu*LI9|sA_$#k_*rF^kq!|c1|9R+>WJ4d}g
zR}Dq@HPjz-IX!UpoLpEd>k%`!BuVZ2Iy%=XzPN$57c;A^x>FO#`o7V0FnE1fui}F0
z>%0jc>gGbvtiwWa{bJ9aOp*-x;i_u|+R3W+aZ1kjj#MA&p4mOqC~k2wr-a#nk8xMm
z_>k+7a|Kl}=)Tt)^*+caf>vMH<aJ?NZoN!3NhiF$MYxA370}e7vMIxj>sCk-FQEK#
zefoH7AA9*N`2l5MBKz9;PEH%$X~Ek|^E#f^9JFPeq_$*G>*_m>CP(Dnw%4-MV%n0L
zJ_Q)-A4=HT=#xfRZVZzxV<b?XOT53Yn9=|AjkH+k+u6df`niz4hTh3?IX}ma7dN)t
z%YCCXoTt%IgE`sIrSu#nXLCZE{c}pVn$a#BLa#OlD38=qmLDE+0Ae1#V}MxiF(Kzb
zZ&Mmw|5~75)0atKNFHhLYPM`U$e-b7J-N8J!*`+4C_(!`;*8mHNnlEo+?<-Pg+|N|
z;hV<XX5(TzNDoiVym~grm^wU~G8LCQZFV9@&F`U_{Nt#P?)|Q3dW%MM@}@DJ&T8&}
zuA_U@t(u?!J2}L3tAZefo*GproYy?V+!+$t-CSC&blzw>Beg~(Yl0nhVHX80lzw$`
zssmN0lvajIQhB}DS8JcSm<$yq5D)+Ww*PNZn#xqR1JQs1%mEGT21Y<1?17gaFa&hS
zTEc7_umDt8)q_3TU<bBZHG~{vwVMugD;f)^iNU;3F&z{kAbg_@2-Q)U3G4w2_yaZw
z0bwu>fpDM-oZ)?iISK+HV!%8SghDO^Vm9!DdC;m#6*#W;aUnVg0stF2F@0_N6;tDQ
z(0VbDj)cMa(z$q8w1=e4ns3EqR|MOkfChOg#z*o5cpUUEX=7DsZj)(GxkE)-ag9`V
zCML1A2|^SBm@9Q3=8WR^5%B-<(^8g`pc-K`OkbaBpiedQfRGNM0cNlY|G$lS1z(;K
z5dnB!D!_P2I35q=ZJ#K5ryDh4l5G>)8t{Ad_-h=fHf9saF_B}4%6yOAMn%E+eJ^iL
z^OfU^`Hz+ok~@kuYJ@Cq@j9yzo#_6Yt`dh0+Bef}E}iHp5L!Q-jF)k9O!KU)Od6>>
zIe^$yeHOTNxiD>M6P1H6WNr@1KUTyu`kOu2rZ1jOIw+Xo@CZP@91p$%Je-S$o-31H
zY^f*J)wX;SRgEg!YH+S_57%8A)NKt@5}8^W7P<sl&bd3xM`$j;WVGjISo#|2smCXX
z*Q>Dn-5j<zIU5`}*Vd}Qm$Wq($#*XHwo||1b*Ulk#@69)&EApPyri={xhdFWoJk*v
z!@kw`zFF>Kmznb=31VHKK;b!6=HLCa15?37Q4t+UJWie<E#;(i<k?5s6Y1V1q5s{h
jCo(IZn-Zjt)P0hV+d(M0Fia-;4sqf{r7oUb`EmRKQI=}x

literal 0
HcmV?d00001

diff --git a/RegexTester/source.extension.vsixmanifest b/RegexTester/source.extension.vsixmanifest
index 834ac31..7502a06 100644
--- a/RegexTester/source.extension.vsixmanifest
+++ b/RegexTester/source.extension.vsixmanifest
@@ -1,46 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="dcad2d98-1e91-4090-81a0-ec0641347bf8">
-    <Name>Regex Tester</Name>
-    <Author>Roman Kurbangaliyev</Author>
-    <Version>1.5.2</Version>
-    <Description xml:space="preserve">Regular expression tester for Visual Studio 2010-2015.</Description>
-    <Locale>1033</Locale>
-    <MoreInfoUrl>http://visualstudiogallery.msdn.microsoft.com/16b9d664-d88c-460e-84a5-700ab40ba452</MoreInfoUrl>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="dcad2d98-1e91-4090-81a0-ec0641347bf8" Version="2.0.0" Language="en-US" Publisher="Roman Kurbangaliyev" />
+    <DisplayName>Regex Tester</DisplayName>
+    <Description xml:space="preserve">Regular Expression Tester for Visual Studio 2017.</Description>
+    <MoreInfo>https://github.com/sharomank/regex-tester</MoreInfo>
     <License>license.txt</License>
+    <ReleaseNotes>changes.txt</ReleaseNotes>
     <Icon>icon.png</Icon>
     <PreviewImage>screenshot.png</PreviewImage>
-    <InstalledByMsi>false</InstalledByMsi>
-    <SupportedProducts>
-      <VisualStudio Version="10.0">
-        <Edition>Ultimate</Edition>
-        <Edition>Premium</Edition>
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="11.0">
-        <Edition>Ultimate</Edition>
-        <Edition>Premium</Edition>
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="12.0">
-        <Edition>Ultimate</Edition>
-        <Edition>Premium</Edition>
-        <Edition>Pro</Edition>
-      </VisualStudio>
-      <VisualStudio Version="14.0">
-        <Edition>Ultimate</Edition>
-        <Edition>Premium</Edition>
-        <Edition>Pro</Edition>
-      </VisualStudio>
-    </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.6" />
-  </Identifier>
-  <References>
-    <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-      <Name>Visual Studio MPF</Name>
-    </Reference>
-  </References>
-  <Content>
-    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
-  </Content>
-</Vsix>
+    <Tags>RegEx, Regular Expression, regular expressions</Tags>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
+</PackageManifest>