From 30a9498a12f0719113e80a97f4a99caebd672631 Mon Sep 17 00:00:00 2001 From: "gaspar.nagy" Date: Sat, 3 Jul 2010 01:15:22 +0200 Subject: [PATCH] moved VsIntegration to the IdeIntegration folder --- .../Vs2008Integration}/BaseCodeGenerator.cs | 2 +- .../BaseCodeGeneratorWithSite.cs | 2 +- .../CodeGeneratorRegistrationAttribute.cs | 0 .../Vs2008Integration}/GlobalSuppressions.cs | 0 .../Vs2008Integration}/Guids.cs | 0 .../SpecFlowEventDefinition.vstemplate | 0 .../SpecFlowEventDefinition1.cs | 0 .../SpecFlowEventDefinitionIcon.ico | Bin .../SpecFlowEventDefinition.vstemplate | 0 .../SpecFlowEventDefinition1.vb | 0 .../SpecFlowEventDefinitionIcon.ico | Bin .../SpecFlowFeature.vstemplate | 0 .../SpecFlowFeature/SpecFlowFeature1.feature | 0 .../SpecFlowFeature/SpecFlowFeatureIcon.ico | Bin .../SpecFlowFeature1.feature | 0 .../SpecFlowFeatureIcon.ico | Bin .../SpecFlowFeature_VB.vstemplate | 0 .../SpecFlowStepDefinition.vstemplate | 0 .../SpecFlowStepDefinition1.cs | 0 .../SpecFlowStepDefinitionIcon.ico | Bin .../SpecFlowStepDefinition.vstemplate | 0 .../SpecFlowStepDefinition1.vb | 0 .../SpecFlowStepDefinitionIcon.ico | Bin .../Properties/AssemblyInfo.cs | 0 .../Vs2008Integration}/Resources.Designer.cs | 8 +- .../Vs2008Integration}/Resources.resx | 0 .../Vs2008Integration}/Resources/Package.ico | Bin ...leGeneratorSupportRegistrationAttribute.cs | 0 .../SpecFlowSingleFileGenerator.cs | 2 +- ...TechTalk.SpecFlow.Vs2008Integration.csproj | 15 ++-- .../Vs2008Integration}/VSPackage.resx | 0 .../SpecFlowInstaller/Product.Generated.wxs | 2 +- .../SpecFlowInstaller.wixproj | 4 +- Installer/SpecFlowInstaller/VS2008.wxs | 10 +-- Installer/SpecFlowInstaller/VS2010.wxs | 10 +-- TechTalk.SpecFlow.sln | 27 +++--- VsIntegration/Key.snk | Bin 596 -> 0 bytes VsIntegration/SpecFlowPackage.cs | 77 ------------------ 38 files changed, 42 insertions(+), 117 deletions(-) rename {VsIntegration => IdeIntegration/Vs2008Integration}/BaseCodeGenerator.cs (98%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/BaseCodeGeneratorWithSite.cs (99%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/CodeGeneratorRegistrationAttribute.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/GlobalSuppressions.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/Guids.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition1.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition1.vb (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature/SpecFlowFeature.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature/SpecFlowFeature1.feature (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature1.feature (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature_VB.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition1.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition.vstemplate (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition1.vb (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/Properties/AssemblyInfo.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/Resources.Designer.cs (92%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/Resources.resx (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/Resources/Package.ico (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/SingleFileGeneratorSupportRegistrationAttribute.cs (100%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/SpecFlowSingleFileGenerator.cs (99%) rename VsIntegration/TechTalk.SpecFlow.VsIntegration.csproj => IdeIntegration/Vs2008Integration/TechTalk.SpecFlow.Vs2008Integration.csproj (93%) rename {VsIntegration => IdeIntegration/Vs2008Integration}/VSPackage.resx (100%) delete mode 100644 VsIntegration/Key.snk delete mode 100644 VsIntegration/SpecFlowPackage.cs diff --git a/VsIntegration/BaseCodeGenerator.cs b/IdeIntegration/Vs2008Integration/BaseCodeGenerator.cs similarity index 98% rename from VsIntegration/BaseCodeGenerator.cs rename to IdeIntegration/Vs2008Integration/BaseCodeGenerator.cs index 38f18549f..6c256b7b3 100644 --- a/VsIntegration/BaseCodeGenerator.cs +++ b/IdeIntegration/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 b/IdeIntegration/Vs2008Integration/BaseCodeGeneratorWithSite.cs similarity index 99% rename from VsIntegration/BaseCodeGeneratorWithSite.cs rename to IdeIntegration/Vs2008Integration/BaseCodeGeneratorWithSite.cs index fb98e7d5a..2da3d9d84 100644 --- a/VsIntegration/BaseCodeGeneratorWithSite.cs +++ b/IdeIntegration/Vs2008Integration/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/VsIntegration/CodeGeneratorRegistrationAttribute.cs b/IdeIntegration/Vs2008Integration/CodeGeneratorRegistrationAttribute.cs similarity index 100% rename from VsIntegration/CodeGeneratorRegistrationAttribute.cs rename to IdeIntegration/Vs2008Integration/CodeGeneratorRegistrationAttribute.cs diff --git a/VsIntegration/GlobalSuppressions.cs b/IdeIntegration/Vs2008Integration/GlobalSuppressions.cs similarity index 100% rename from VsIntegration/GlobalSuppressions.cs rename to IdeIntegration/Vs2008Integration/GlobalSuppressions.cs diff --git a/VsIntegration/Guids.cs b/IdeIntegration/Vs2008Integration/Guids.cs similarity index 100% rename from VsIntegration/Guids.cs rename to IdeIntegration/Vs2008Integration/Guids.cs diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition1.cs b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition1.cs similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition1.cs rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinition1.cs diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition1.vb b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition1.vb similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition1.vb rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinition1.vb diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeature.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeature.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeature.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeature.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeature1.feature b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeature1.feature similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeature1.feature rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeature1.feature diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature1.feature b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature1.feature similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature1.feature rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature1.feature diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature_VB.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature_VB.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature_VB.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeature_VB.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition1.cs b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition1.cs similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition1.cs rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinition1.cs diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition.vstemplate b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition.vstemplate similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition.vstemplate rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition.vstemplate diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition1.vb b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition1.vb similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition1.vb rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinition1.vb diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico b/IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico similarity index 100% rename from VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico rename to IdeIntegration/Vs2008Integration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico diff --git a/VsIntegration/Properties/AssemblyInfo.cs b/IdeIntegration/Vs2008Integration/Properties/AssemblyInfo.cs similarity index 100% rename from VsIntegration/Properties/AssemblyInfo.cs rename to IdeIntegration/Vs2008Integration/Properties/AssemblyInfo.cs diff --git a/VsIntegration/Resources.Designer.cs b/IdeIntegration/Vs2008Integration/Resources.Designer.cs similarity index 92% rename from VsIntegration/Resources.Designer.cs rename to IdeIntegration/Vs2008Integration/Resources.Designer.cs index 716e6f0ae..033278d4d 100644 --- a/VsIntegration/Resources.Designer.cs +++ b/IdeIntegration/Vs2008Integration/Resources.Designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4918 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace TechTalk.SpecFlow.VsIntegration { +namespace TechTalk.SpecFlow.Vs2008Integration { using System; @@ -19,7 +19,7 @@ namespace TechTalk.SpecFlow.VsIntegration { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TechTalk.SpecFlow.VsIntegration.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TechTalk.SpecFlow.Vs2008Integration.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/VsIntegration/Resources.resx b/IdeIntegration/Vs2008Integration/Resources.resx similarity index 100% rename from VsIntegration/Resources.resx rename to IdeIntegration/Vs2008Integration/Resources.resx diff --git a/VsIntegration/Resources/Package.ico b/IdeIntegration/Vs2008Integration/Resources/Package.ico similarity index 100% rename from VsIntegration/Resources/Package.ico rename to IdeIntegration/Vs2008Integration/Resources/Package.ico diff --git a/VsIntegration/SingleFileGeneratorSupportRegistrationAttribute.cs b/IdeIntegration/Vs2008Integration/SingleFileGeneratorSupportRegistrationAttribute.cs similarity index 100% rename from VsIntegration/SingleFileGeneratorSupportRegistrationAttribute.cs rename to IdeIntegration/Vs2008Integration/SingleFileGeneratorSupportRegistrationAttribute.cs diff --git a/VsIntegration/SpecFlowSingleFileGenerator.cs b/IdeIntegration/Vs2008Integration/SpecFlowSingleFileGenerator.cs similarity index 99% rename from VsIntegration/SpecFlowSingleFileGenerator.cs rename to IdeIntegration/Vs2008Integration/SpecFlowSingleFileGenerator.cs index d7352f874..53ecd47b4 100644 --- a/VsIntegration/SpecFlowSingleFileGenerator.cs +++ b/IdeIntegration/Vs2008Integration/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/VsIntegration/TechTalk.SpecFlow.VsIntegration.csproj b/IdeIntegration/Vs2008Integration/TechTalk.SpecFlow.Vs2008Integration.csproj similarity index 93% rename from VsIntegration/TechTalk.SpecFlow.VsIntegration.csproj rename to IdeIntegration/Vs2008Integration/TechTalk.SpecFlow.Vs2008Integration.csproj index 9c05ef760..0d2841424 100644 --- a/VsIntegration/TechTalk.SpecFlow.VsIntegration.csproj +++ b/IdeIntegration/Vs2008Integration/TechTalk.SpecFlow.Vs2008Integration.csproj @@ -7,14 +7,14 @@ 2.0 Library Properties - TechTalk.SpecFlow.VsIntegration - TechTalk.SpecFlow.VsIntegration + TechTalk.SpecFlow.Vs2008Integration + TechTalk.SpecFlow.Vs2008Integration False Key.snk v3.5 {5703CA95-A08A-46AE-AE24-DB6B21FD6F7E} true - ..\specflow.snk + ..\..\specflow.snk true @@ -61,10 +61,10 @@ - + StringExtensions.cs - + VersionInfo.cs @@ -83,7 +83,6 @@ - @@ -112,11 +111,11 @@ - + {453D8014-B6CD-4E86-80A8-D59F59092334} TechTalk.SpecFlow.Generator - + {7CCEF6D6-FC17-422E-9BED-EDD752B6496F} TechTalk.SpecFlow.Parser diff --git a/VsIntegration/VSPackage.resx b/IdeIntegration/Vs2008Integration/VSPackage.resx similarity index 100% rename from VsIntegration/VSPackage.resx rename to IdeIntegration/Vs2008Integration/VSPackage.resx diff --git a/Installer/SpecFlowInstaller/Product.Generated.wxs b/Installer/SpecFlowInstaller/Product.Generated.wxs index 5079b3d9f..5a19c7173 100644 --- a/Installer/SpecFlowInstaller/Product.Generated.wxs +++ b/Installer/SpecFlowInstaller/Product.Generated.wxs @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj b/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj index a3ae654ac..ba3cb4873 100644 --- a/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj +++ b/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj @@ -72,8 +72,8 @@ Binaries INSTALLLOCATION - - TechTalk.SpecFlow.VsIntegration + + TechTalk.SpecFlow.Vs2008Integration {5703ca95-a08a-46ae-ae24-db6b21fd6f7e} True Binaries diff --git a/Installer/SpecFlowInstaller/VS2008.wxs b/Installer/SpecFlowInstaller/VS2008.wxs index 9d464fa99..954266259 100644 --- a/Installer/SpecFlowInstaller/VS2008.wxs +++ b/Installer/SpecFlowInstaller/VS2008.wxs @@ -18,14 +18,14 @@ - + - + @@ -46,9 +46,9 @@ - - - + + + diff --git a/Installer/SpecFlowInstaller/VS2010.wxs b/Installer/SpecFlowInstaller/VS2010.wxs index e1114caca..cdfaa65fc 100644 --- a/Installer/SpecFlowInstaller/VS2010.wxs +++ b/Installer/SpecFlowInstaller/VS2010.wxs @@ -18,14 +18,14 @@ - + - + @@ -46,9 +46,9 @@ - - - + + + diff --git a/TechTalk.SpecFlow.sln b/TechTalk.SpecFlow.sln index 2ca2b0180..ca71ebf02 100644 --- 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 deleted file mode 100644 index ae1326e9ba4567e18e398f833bd54430c8b8ad96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097NTy%|3fJItMRDewYn~UIeKBOD*{AkyKLjbjJ53nVR)Wy)UfzBV(}Yw0SR1oDb(oOh2u#DN|7@S@s0NEZr`R(k~V z$|=9}e0FTAi5cJF_+PF0H@hmIEt8@r2qG3k<3m90g`)nE6t+~kF)qsxuGm4XUajVp zN3zHJLaD}7lZ^?+=Q# zzLcOFHCkn$wD0-<6O-A|DgK2qcQ}CY%F2FhM;ZSj%86)vXls@e_eIW4K|$TMZHP6$ z!JjF3QoOwdfFpE%zZ%&mpiy1y3`XoN(7#J9!P25(VLq#@e2JN>BF!MQt5T-H>(!b><5geS%XlxPs-mEJndv^B0G1(qT4t@ z3@lM_g7pP0QtC-=Zm{4T=_Qg12&sLwO4p1uE#D6zrPiMrvY>^M2>UY&+igUkyVnzx zW-*X|3jNga-++-#fBb}!4yg!d-nMb`FT-aMsq)E-`&r^t;Mf3Ddo!nW - /// This is the class that implements the package exposed by this assembly. - /// - /// The minimum requirement for a class to be considered a valid package for Visual Studio - /// is to implement the IVsPackage interface and register itself with the shell. - /// This package uses the helper classes defined inside the Managed Package Framework (MPF) - /// to do it: it derives from the Package class that provides the implementation of the - /// IVsPackage interface and uses the registration attributes defined in the framework to - /// register itself and its components with the shell. - /// - // This attribute tells the registration utility (regpkg.exe) that this class needs - // to be registered as package. - [PackageRegistration(UseManagedResourcesOnly = true)] - // A Visual Studio component can be registered under different regitry roots; for instance - // when you debug your package you want to register it in the experimental hive. This - // attribute specifies the registry root to use if no one is provided to regpkg.exe with - // the /root switch. - [DefaultRegistryRoot("Software\\Microsoft\\VisualStudio\\9.0")] - // This attribute is used to register the informations needed to show the this package - // in the Help/About dialog of Visual Studio. - [InstalledProductRegistration(false, "#110", "#112", "1.0", IconResourceID = 400)] - // In order be loaded inside Visual Studio in a machine that has not the VS SDK installed, - // package needs to have a valid load key (it can be requested at - // http://msdn.microsoft.com/vstudio/extend/). This attributes tells the shell that this - // package has a load key embedded in its resources. - [ProvideLoadKey("Standard", "1.0", "SpecFlow", "TechTalk", 1)] - [Guid(GuidList.guidTechTalk_SpecFlowPkgString)] - public sealed class SpecFlowPackage : Package - { - /// - /// Default constructor of the package. - /// Inside this method you can place any initialization code that does not require - /// any Visual Studio service because at this point the package object is created but - /// not sited yet inside Visual Studio environment. The place to do all the other - /// initialization is the Initialize method. - /// - public SpecFlowPackage() - { - Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", this.ToString())); - } - - - - ///////////////////////////////////////////////////////////////////////////// - // Overriden Package Implementation - #region Package Members - - /// - /// Initialization of the package; this method is called right after the package is sited, so this is the place - /// where you can put all the initilaization code that rely on services provided by VisualStudio. - /// - protected override void Initialize() - { - Trace.WriteLine (string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString())); - base.Initialize(); - - } - #endregion - - } -}*/ \ No newline at end of file