moved VsIntegration to the IdeIntegration folder

xerxesb · Jul 2, 2010 · 30a9498 · 30a9498
1 parent 988ff7c
commit 30a9498
Show file tree

Hide file tree

Showing 38 changed files with 42 additions and 117 deletions.
diff --git a/VsIntegration/BaseCodeGenerator.cs → ...on/Vs2008Integration/BaseCodeGenerator.cs b/VsIntegration/BaseCodeGenerator.cs → ...on/Vs2008Integration/BaseCodeGenerator.cs
@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace TechTalk.SpecFlow.VsIntegration
+namespace TechTalk.SpecFlow.Vs2008Integration
 {
     [System.Runtime.InteropServices.ComVisible(true)]
     [Guid("8EC3552F-9C6A-472f-8E64-630C7CAE0179")]

diff --git a/VsIntegration/BaseCodeGeneratorWithSite.cs → ...8Integration/BaseCodeGeneratorWithSite.cs b/VsIntegration/BaseCodeGeneratorWithSite.cs → ...8Integration/BaseCodeGeneratorWithSite.cs
@@ -13,7 +13,7 @@
 using VSOLE = Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 
-namespace TechTalk.SpecFlow.VsIntegration
+namespace TechTalk.SpecFlow.Vs2008Integration
 {
     [System.Runtime.InteropServices.ComVisible(true)]
     [Guid("800FD294-E1AF-4a80-AFF2-FFBCE664D020")]

diff --git a/...ion/CodeGeneratorRegistrationAttribute.cs → ...ion/CodeGeneratorRegistrationAttribute.cs b/...ion/CodeGeneratorRegistrationAttribute.cs → ...ion/CodeGeneratorRegistrationAttribute.cs
diff --git a/VsIntegration/GlobalSuppressions.cs → ...n/Vs2008Integration/GlobalSuppressions.cs b/VsIntegration/GlobalSuppressions.cs → ...n/Vs2008Integration/GlobalSuppressions.cs
diff --git a/VsIntegration/Guids.cs → IdeIntegration/Vs2008Integration/Guids.cs b/VsIntegration/Guids.cs → IdeIntegration/Vs2008Integration/Guids.cs
diff --git a/...nition/SpecFlowEventDefinition.vstemplate → ...nition/SpecFlowEventDefinition.vstemplate b/...nition/SpecFlowEventDefinition.vstemplate → ...nition/SpecFlowEventDefinition.vstemplate
diff --git a/...entDefinition/SpecFlowEventDefinition1.cs → ...entDefinition/SpecFlowEventDefinition1.cs b/...entDefinition/SpecFlowEventDefinition1.cs → ...entDefinition/SpecFlowEventDefinition1.cs
diff --git a/...efinition/SpecFlowEventDefinitionIcon.ico → ...efinition/SpecFlowEventDefinitionIcon.ico b/...efinition/SpecFlowEventDefinitionIcon.ico → ...efinition/SpecFlowEventDefinitionIcon.ico
diff --git a/...ion_VB/SpecFlowEventDefinition.vstemplate → ...ion_VB/SpecFlowEventDefinition.vstemplate b/...ion_VB/SpecFlowEventDefinition.vstemplate → ...ion_VB/SpecFlowEventDefinition.vstemplate
diff --git a/...Definition_VB/SpecFlowEventDefinition1.vb → ...Definition_VB/SpecFlowEventDefinition1.vb b/...Definition_VB/SpecFlowEventDefinition1.vb → ...Definition_VB/SpecFlowEventDefinition1.vb
diff --git a/...nition_VB/SpecFlowEventDefinitionIcon.ico → ...nition_VB/SpecFlowEventDefinitionIcon.ico b/...nition_VB/SpecFlowEventDefinitionIcon.ico → ...nition_VB/SpecFlowEventDefinitionIcon.ico
diff --git a/...pecFlowFeature/SpecFlowFeature.vstemplate → ...pecFlowFeature/SpecFlowFeature.vstemplate b/...pecFlowFeature/SpecFlowFeature.vstemplate → ...pecFlowFeature/SpecFlowFeature.vstemplate
diff --git a/.../SpecFlowFeature/SpecFlowFeature1.feature → .../SpecFlowFeature/SpecFlowFeature1.feature b/.../SpecFlowFeature/SpecFlowFeature1.feature → .../SpecFlowFeature/SpecFlowFeature1.feature
diff --git a/...s/SpecFlowFeature/SpecFlowFeatureIcon.ico → ...s/SpecFlowFeature/SpecFlowFeatureIcon.ico b/...s/SpecFlowFeature/SpecFlowFeatureIcon.ico → ...s/SpecFlowFeature/SpecFlowFeatureIcon.ico
diff --git a/...ecFlowFeature_VB/SpecFlowFeature1.feature → ...ecFlowFeature_VB/SpecFlowFeature1.feature b/...ecFlowFeature_VB/SpecFlowFeature1.feature → ...ecFlowFeature_VB/SpecFlowFeature1.feature
diff --git a/...pecFlowFeature_VB/SpecFlowFeatureIcon.ico → ...pecFlowFeature_VB/SpecFlowFeatureIcon.ico b/...pecFlowFeature_VB/SpecFlowFeatureIcon.ico → ...pecFlowFeature_VB/SpecFlowFeatureIcon.ico
diff --git a/...wFeature_VB/SpecFlowFeature_VB.vstemplate → ...wFeature_VB/SpecFlowFeature_VB.vstemplate b/...wFeature_VB/SpecFlowFeature_VB.vstemplate → ...wFeature_VB/SpecFlowFeature_VB.vstemplate
diff --git a/...inition/SpecFlowStepDefinition.vstemplate → ...inition/SpecFlowStepDefinition.vstemplate b/...inition/SpecFlowStepDefinition.vstemplate → ...inition/SpecFlowStepDefinition.vstemplate
diff --git a/...StepDefinition/SpecFlowStepDefinition1.cs → ...StepDefinition/SpecFlowStepDefinition1.cs b/...StepDefinition/SpecFlowStepDefinition1.cs → ...StepDefinition/SpecFlowStepDefinition1.cs
diff --git a/...Definition/SpecFlowStepDefinitionIcon.ico → ...Definition/SpecFlowStepDefinitionIcon.ico b/...Definition/SpecFlowStepDefinitionIcon.ico → ...Definition/SpecFlowStepDefinitionIcon.ico
diff --git a/...tion_VB/SpecFlowStepDefinition.vstemplate → ...tion_VB/SpecFlowStepDefinition.vstemplate b/...tion_VB/SpecFlowStepDefinition.vstemplate → ...tion_VB/SpecFlowStepDefinition.vstemplate
diff --git a/...pDefinition_VB/SpecFlowStepDefinition1.vb → ...pDefinition_VB/SpecFlowStepDefinition1.vb b/...pDefinition_VB/SpecFlowStepDefinition1.vb → ...pDefinition_VB/SpecFlowStepDefinition1.vb
diff --git a/...inition_VB/SpecFlowStepDefinitionIcon.ico → ...inition_VB/SpecFlowStepDefinitionIcon.ico b/...inition_VB/SpecFlowStepDefinitionIcon.ico → ...inition_VB/SpecFlowStepDefinitionIcon.ico
diff --git a/VsIntegration/Properties/AssemblyInfo.cs → ...008Integration/Properties/AssemblyInfo.cs b/VsIntegration/Properties/AssemblyInfo.cs → ...008Integration/Properties/AssemblyInfo.cs
diff --git a/VsIntegration/Resources.Designer.cs → ...n/Vs2008Integration/Resources.Designer.cs b/VsIntegration/Resources.Designer.cs → ...n/Vs2008Integration/Resources.Designer.cs
diff --git a/VsIntegration/Resources.resx → ...egration/Vs2008Integration/Resources.resx b/VsIntegration/Resources.resx → ...egration/Vs2008Integration/Resources.resx
diff --git a/VsIntegration/Resources/Package.ico → ...n/Vs2008Integration/Resources/Package.ico b/VsIntegration/Resources/Package.ico → ...n/Vs2008Integration/Resources/Package.ico
diff --git a/...eGeneratorSupportRegistrationAttribute.cs → ...eGeneratorSupportRegistrationAttribute.cs b/...eGeneratorSupportRegistrationAttribute.cs → ...eGeneratorSupportRegistrationAttribute.cs
diff --git a/VsIntegration/SpecFlowSingleFileGenerator.cs → ...ntegration/SpecFlowSingleFileGenerator.cs b/VsIntegration/SpecFlowSingleFileGenerator.cs → ...ntegration/SpecFlowSingleFileGenerator.cs
@@ -13,7 +13,7 @@
 using TechTalk.SpecFlow.Parser;
 using VSLangProj80;
 
-namespace TechTalk.SpecFlow.VsIntegration
+namespace TechTalk.SpecFlow.Vs2008Integration
 {
     [System.Runtime.InteropServices.ComVisible(true)]
     [Guid("3C9CF10A-A9AB-4899-A0FB-4B3BE4A36C15")]

diff --git a/...on/TechTalk.SpecFlow.VsIntegration.csproj → ...echTalk.SpecFlow.Vs2008Integration.csproj b/...on/TechTalk.SpecFlow.VsIntegration.csproj → ...echTalk.SpecFlow.Vs2008Integration.csproj
@@ -7,14 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TechTalk.SpecFlow.VsIntegration</RootNamespace>
-    <AssemblyName>TechTalk.SpecFlow.VsIntegration</AssemblyName>
+    <RootNamespace>TechTalk.SpecFlow.Vs2008Integration</RootNamespace>
+    <AssemblyName>TechTalk.SpecFlow.Vs2008Integration</AssemblyName>
     <SignAssembly>False</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ProjectGuid>{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}</ProjectGuid>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\specflow.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\specflow.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,10 +61,10 @@
     <Reference Include="VSLangProj80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Runtime\StringExtensions.cs">
+    <Compile Include="..\..\Runtime\StringExtensions.cs">
       <Link>StringExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="BaseCodeGenerator.cs" />
@@ -83,7 +83,6 @@
     </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="SingleFileGeneratorSupportRegistrationAttribute.cs" />
-    <Compile Include="SpecFlowPackage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -112,11 +111,11 @@
     <Content Include="Resources\Package.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Generator\TechTalk.SpecFlow.Generator.csproj">
+    <ProjectReference Include="..\..\Generator\TechTalk.SpecFlow.Generator.csproj">
       <Project>{453D8014-B6CD-4E86-80A8-D59F59092334}</Project>
       <Name>TechTalk.SpecFlow.Generator</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Parser\TechTalk.SpecFlow.Parser.csproj">
+    <ProjectReference Include="..\..\Parser\TechTalk.SpecFlow.Parser.csproj">
       <Project>{7CCEF6D6-FC17-422E-9BED-EDD752B6496F}</Project>
       <Name>TechTalk.SpecFlow.Parser</Name>
     </ProjectReference>

diff --git a/VsIntegration/VSPackage.resx → ...egration/Vs2008Integration/VSPackage.resx b/VsIntegration/VSPackage.resx → ...egration/Vs2008Integration/VSPackage.resx
diff --git a/Installer/SpecFlowInstaller/Product.Generated.wxs b/Installer/SpecFlowInstaller/Product.Generated.wxs
@@ -10,7 +10,7 @@
       <ComponentGroupRef Id="TechTalk.SpecFlow.Silverlight.Satellites" />
       <ComponentGroupRef Id="TechTalk.SpecFlow.Binaries" />
       <ComponentGroupRef Id="TechTalk.SpecFlow.Tools.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.VsIntegration.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Vs2008Integration.Binaries" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj b/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj
@@ -72,8 +72,8 @@
       <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
       <RefTargetDir>INSTALLLOCATION</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\VsIntegration\TechTalk.SpecFlow.VsIntegration.csproj">
-      <Name>TechTalk.SpecFlow.VsIntegration</Name>
+    <ProjectReference Include="..\..\IdeIntegration\Vs2008Integration\TechTalk.SpecFlow.Vs2008Integration.csproj">
+      <Name>TechTalk.SpecFlow.Vs2008Integration</Name>
       <Project>{5703ca95-a08a-46ae-ae24-db6b21fd6f7e}</Project>
       <Private>True</Private>
       <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>

diff --git a/Installer/SpecFlowInstaller/VS2008.wxs b/Installer/SpecFlowInstaller/VS2008.wxs
@@ -18,14 +18,14 @@
       </Directory>
 
       <Directory Id="Dir_VS2008_ItemTemplates" Name="VS2008_ItemTemplates">
-        <Directory Id="Dir_VS2008_ItemTemplates_CSharp" Name="CSharp" FileSource="$(var.TechTalk.SpecFlow.VsIntegration.TargetDir)">
+        <Directory Id="Dir_VS2008_ItemTemplates_CSharp" Name="CSharp" FileSource="$(var.TechTalk.SpecFlow.Vs2008Integration.TargetDir)">
           <Component Id="Comp_VS2008ItemTemplates_CSharp" Guid="50EF978E-F646-48e8-96A3-01EC83374FF0">
             <File Id="File_SpecFlowFeature.zip_VS2008" Name="SpecFlowFeature.zip" />
             <File Id="File_SpecFlowStepDefinition.zip_VS2008" Name="SpecFlowStepDefinition.zip" />
             <File Id="File_SpecFlowEventDefinition.zip_VS2008" Name="SpecFlowEventDefinition.zip" />
           </Component>
         </Directory>
-        <Directory Id="Dir_VS2008_ItemTemplates_VisualBasic" Name="VisualBasic" FileSource="$(var.TechTalk.SpecFlow.VsIntegration.TargetDir)">
+        <Directory Id="Dir_VS2008_ItemTemplates_VisualBasic" Name="VisualBasic" FileSource="$(var.TechTalk.SpecFlow.Vs2008Integration.TargetDir)">
           <Component Id="Comp_VS2008ItemTemplates_VisualBasic" Guid="64327D18-847B-479e-AAAD-FFB966BC2805">
             <File Id="File_SpecFlowFeature_VB.zip_VS2008" Name="SpecFlowFeature_VB.zip" />
             <File Id="File_SpecFlowStepDefinition_VB.zip_VS2008" Name="SpecFlowStepDefinition_VB.zip" />
@@ -46,9 +46,9 @@
     <DirectoryRef Id="INSTALLLOCATION">
       <Component Id="Comp_VS2008Registry" Guid="93BC230A-5294-4b31-8DDB-884D58034148">
         <RegistryKey Root="HKLM" Key="$(var.Vs2008RegPath)\CLSID\$(var.CLSID_SpecFlowSingleFileGenerator)" Action="createAndRemoveOnUninstall">
-          <RegistryValue Value="TechTalk.SpecFlow.VsIntegration.SpecFlowSingleFileGenerator" Type="string" />
-          <RegistryValue Name="Class" Value="TechTalk.SpecFlow.VsIntegration.SpecFlowSingleFileGenerator" Type="string" />
-          <RegistryValue Name="CodeBase" Value="[INSTALLLOCATION]TechTalk.SpecFlow.VsIntegration.dll" Type="string" />
+          <RegistryValue Value="TechTalk.SpecFlow.Vs2008Integration.SpecFlowSingleFileGenerator" Type="string" />
+          <RegistryValue Name="Class" Value="TechTalk.SpecFlow.Vs2008Integration.SpecFlowSingleFileGenerator" Type="string" />
+          <RegistryValue Name="CodeBase" Value="[INSTALLLOCATION]TechTalk.SpecFlow.Vs2008Integration.dll" Type="string" />
           <RegistryValue Name="InprocServer32" Value="C:\\Windows\\SYSTEM32\\MSCOREE.DLL" Type="string" />
           <RegistryValue Name="ThreadingModel" Value="Both" Type="string" />
         </RegistryKey>

diff --git a/Installer/SpecFlowInstaller/VS2010.wxs b/Installer/SpecFlowInstaller/VS2010.wxs
@@ -18,14 +18,14 @@
       </Directory>
 
       <Directory Id="Dir_VS2010_ItemTemplates" Name="VS2010_ItemTemplates">
-        <Directory Id="Dir_VS2010_ItemTemplates_CSharp" Name="CSharp" FileSource="$(var.TechTalk.SpecFlow.VsIntegration.TargetDir)">
+        <Directory Id="Dir_VS2010_ItemTemplates_CSharp" Name="CSharp" FileSource="$(var.TechTalk.SpecFlow.Vs2008Integration.TargetDir)">
           <Component Id="Comp_VS2010ItemTemplates_CSharp" Guid="23464AB4-D785-48da-80D7-A817AA5D4152">
             <File Id="File_SpecFlowFeature.zip_VS2010" Name="SpecFlowFeature.zip" />
             <File Id="File_SpecFlowStepDefinition.zip_VS2010" Name="SpecFlowStepDefinition.zip" />
             <File Id="File_SpecFlowEventDefinition.zip_VS2010" Name="SpecFlowEventDefinition.zip" />
           </Component>
         </Directory>
-        <Directory Id="Dir_VS2010_ItemTemplates_VisualBasic" Name="VisualBasic" FileSource="$(var.TechTalk.SpecFlow.VsIntegration.TargetDir)">
+        <Directory Id="Dir_VS2010_ItemTemplates_VisualBasic" Name="VisualBasic" FileSource="$(var.TechTalk.SpecFlow.Vs2008Integration.TargetDir)">
           <Component Id="Comp_VS2010ItemTemplates_VisualBasic" Guid="8074242F-AD50-4135-A3BF-69D468C440DF">
             <File Id="File_SpecFlowFeature_VB.zip_VS2010" Name="SpecFlowFeature_VB.zip" />
             <File Id="File_SpecFlowStepDefinition_VB.zip_VS2010" Name="SpecFlowStepDefinition_VB.zip" />
@@ -46,9 +46,9 @@
     <DirectoryRef Id="INSTALLLOCATION">
       <Component Id="Comp_VS2010Registry" Guid="88BDD46F-2005-48a0-A065-4DA9E40039A6">
         <RegistryKey Root="HKLM" Key="$(var.Vs2010RegPath)\CLSID\$(var.CLSID_SpecFlowSingleFileGenerator)" Action="createAndRemoveOnUninstall">
-          <RegistryValue Value="TechTalk.SpecFlow.VsIntegration.SpecFlowSingleFileGenerator" Type="string" />
-          <RegistryValue Name="Class" Value="TechTalk.SpecFlow.VsIntegration.SpecFlowSingleFileGenerator" Type="string" />
-          <RegistryValue Name="CodeBase" Value="[INSTALLLOCATION]TechTalk.SpecFlow.VsIntegration.dll" Type="string" />
+          <RegistryValue Value="TechTalk.SpecFlow.Vs2008Integration.SpecFlowSingleFileGenerator" Type="string" />
+          <RegistryValue Name="Class" Value="TechTalk.SpecFlow.Vs2008Integration.SpecFlowSingleFileGenerator" Type="string" />
+          <RegistryValue Name="CodeBase" Value="[INSTALLLOCATION]TechTalk.SpecFlow.Vs2008Integration.dll" Type="string" />
           <RegistryValue Name="InprocServer32" Value="C:\\Windows\\SYSTEM32\\MSCOREE.DLL" Type="string" />
           <RegistryValue Name="ThreadingModel" Value="Both" Type="string" />
         </RegistryKey>

diff --git a/TechTalk.SpecFlow.sln b/TechTalk.SpecFlow.sln
@@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParserTests", "Tests\Parser
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RuntimeTests", "Tests\RuntimeTests\RuntimeTests.csproj", "{F8FACCF0-5497-4C6B-861F-78D72FD9561B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.VsIntegration", "VsIntegration\TechTalk.SpecFlow.VsIntegration.csproj", "{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.Generator", "Generator\TechTalk.SpecFlow.Generator.csproj", "{453D8014-B6CD-4E86-80A8-D59F59092334}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.Tools", "Tools\TechTalk.SpecFlow.Tools.csproj", "{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}"
@@ -51,6 +49,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingTests", "Tests\Rep
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingTest.SampleProject", "Tests\ReportingTest.SampleProject\ReportingTest.SampleProject.csproj", "{E5C299D5-E7CC-4477-9A0B-4797B74BC88B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IdeIntegration", "IdeIntegration", "{55E45533-9AAA-41AB-B44F-7530799C9337}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.Vs2008Integration", "IdeIntegration\Vs2008Integration\TechTalk.SpecFlow.Vs2008Integration.csproj", "{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -111,16 +113,6 @@ Global
 		{F8FACCF0-5497-4C6B-861F-78D72FD9561B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F8FACCF0-5497-4C6B-861F-78D72FD9561B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F8FACCF0-5497-4C6B-861F-78D72FD9561B}.Release|x86.ActiveCfg = Release|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|x86.ActiveCfg = Release|Any CPU
 		{453D8014-B6CD-4E86-80A8-D59F59092334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{453D8014-B6CD-4E86-80A8-D59F59092334}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{453D8014-B6CD-4E86-80A8-D59F59092334}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -210,6 +202,16 @@ Global
 		{E5C299D5-E7CC-4477-9A0B-4797B74BC88B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5C299D5-E7CC-4477-9A0B-4797B74BC88B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5C299D5-E7CC-4477-9A0B-4797B74BC88B}.Release|x86.ActiveCfg = Release|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -224,5 +226,6 @@ Global
 		{3836A6FC-4ECC-413A-AC8F-83A0A773EC9E} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
 		{1965463E-6972-4618-8E59-D3259AE7A125} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
 		{E5C299D5-E7CC-4477-9A0B-4797B74BC88B} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
+		{5703CA95-A08A-46AE-AE24-DB6B21FD6F7E} = {55E45533-9AAA-41AB-B44F-7530799C9337}
 	EndGlobalSection
 EndGlobal
diff --git a/VsIntegration/Key.snk b/VsIntegration/Key.snk
diff --git a/VsIntegration/SpecFlowPackage.cs b/VsIntegration/SpecFlowPackage.cs