From f4d4ff3bf1914fd35691f15d8c02a1838a63008d Mon Sep 17 00:00:00 2001
From: Attila Sztupak <attila.sztupak@gmail.com>
Date: Tue, 29 Jun 2010 10:05:44 +0200
Subject: [PATCH] .feature files are working like expected in silverlight
 projects added "mstest.silverlight" generator

---
 .../Configuration/GeneratorConfiguration.cs   |  11 +-
 Generator/TechTalk.SpecFlow.Generator.csproj  | 187 +++++++++---------
 .../MsTestSilverlightGeneratorProvider.cs     | 124 ++++++++++++
 Installer/SpecFlowInstaller/Common.wxi        |   1 +
 .../SpecFlowInstaller/Product.Generated.wxs   |  27 +--
 .../SpecFlowInstaller.wixproj                 | 187 +++++++++---------
 Installer/SpecFlowInstaller/VS2010.wxs        |  10 +
 7 files changed, 348 insertions(+), 199 deletions(-)
 create mode 100755 Generator/UnitTestProvider/MsTestSilverlightGeneratorProvider.cs

diff --git a/Generator/Configuration/GeneratorConfiguration.cs b/Generator/Configuration/GeneratorConfiguration.cs
index 9ff0be821..f1f960d47 100644
--- a/Generator/Configuration/GeneratorConfiguration.cs
+++ b/Generator/Configuration/GeneratorConfiguration.cs
@@ -74,10 +74,13 @@ private void SetUnitTestDefaultsByName(string name)
                     break;
                 case "xunit":
                     GeneratorUnitTestProviderType = typeof(XUnitTestGeneratorProvider);
-                    break;
-                case "mstest":
-                    GeneratorUnitTestProviderType = typeof(MsTestGeneratorProvider);
-                    break;
+                    break;
+                case "mstest":
+                    GeneratorUnitTestProviderType = typeof(MsTestGeneratorProvider);
+                    break;
+                case "mstest.silverlight":
+                    GeneratorUnitTestProviderType = typeof(MsTestSilverlightGeneratorProvider);
+                    break;
                 default:
                     GeneratorUnitTestProviderType = null;
                     break;
diff --git a/Generator/TechTalk.SpecFlow.Generator.csproj b/Generator/TechTalk.SpecFlow.Generator.csproj
index 70701ee13..6efba04a1 100644
--- a/Generator/TechTalk.SpecFlow.Generator.csproj
+++ b/Generator/TechTalk.SpecFlow.Generator.csproj
@@ -1,100 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{453D8014-B6CD-4E86-80A8-D59F59092334}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TechTalk.SpecFlow.Generator</RootNamespace>
-    <AssemblyName>TechTalk.SpecFlow.Generator</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\specflow.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Runtime\Configuration\ConfigDefaults.cs">
-      <Link>Configuration\ConfigDefaults.cs</Link>
-    </Compile>
-    <Compile Include="..\Runtime\Configuration\ConfigurationSectionHandler.cs">
-      <Link>Configuration\ConfigurationSectionHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Runtime\Configuration\ConfigurationServices.cs">
-      <Link>Configuration\ConfigurationServices.cs</Link>
-    </Compile>
-    <Compile Include="..\Runtime\Configuration\MissingOrPendingStepsOutcome.cs">
-      <Link>Configuration\MissingOrPendingStepsOutcome.cs</Link>
-    </Compile>
-    <Compile Include="..\Runtime\StringExtensions.cs">
-      <Link>StringExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\VersionInfo.cs">
-      <Link>VersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="BatchGenerator.cs" />
-    <Compile Include="CodeDomHelper.cs" />
-    <Compile Include="Configuration\GeneratorConfiguration.cs" />
-    <Compile Include="Configuration\GeneratorConfigurationReader.cs" />
-    <Compile Include="Configuration\MsBuildProjectReader.cs" />
-    <Compile Include="Configuration\SpecFlowProject.cs" />
-    <Compile Include="UnitTestConverter\ISpecFlowUnitTestConverter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SpecFlowGenerator.cs" />
-    <Compile Include="SpecFlowUnitTestConverter.cs" />
-    <Compile Include="UnitTestProvider\MbUnitTestGeneratorProvider.cs" />
-    <Compile Include="UnitTestProvider\XUnitTestGeneratorProvider.cs" />
-    <Compile Include="UnitTestProvider\IUnitTestGeneratorProvider.cs" />
-    <Compile Include="UnitTestProvider\MsTestGeneratorProvider.cs" />
-    <Compile Include="UnitTestProvider\NUnitTestConverter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Parser\TechTalk.SpecFlow.Parser.csproj">
-      <Project>{7CCEF6D6-FC17-422E-9BED-EDD752B6496F}</Project>
-      <Name>TechTalk.SpecFlow.Parser</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{453D8014-B6CD-4E86-80A8-D59F59092334}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechTalk.SpecFlow.Generator</RootNamespace>
+    <AssemblyName>TechTalk.SpecFlow.Generator</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\specflow.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Build.Engine" />
+    <Reference Include="System" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Runtime\Configuration\ConfigDefaults.cs">
+      <Link>Configuration\ConfigDefaults.cs</Link>
+    </Compile>
+    <Compile Include="..\Runtime\Configuration\ConfigurationSectionHandler.cs">
+      <Link>Configuration\ConfigurationSectionHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\Runtime\Configuration\ConfigurationServices.cs">
+      <Link>Configuration\ConfigurationServices.cs</Link>
+    </Compile>
+    <Compile Include="..\Runtime\Configuration\MissingOrPendingStepsOutcome.cs">
+      <Link>Configuration\MissingOrPendingStepsOutcome.cs</Link>
+    </Compile>
+    <Compile Include="..\Runtime\StringExtensions.cs">
+      <Link>StringExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\VersionInfo.cs">
+      <Link>VersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="BatchGenerator.cs" />
+    <Compile Include="CodeDomHelper.cs" />
+    <Compile Include="Configuration\GeneratorConfiguration.cs" />
+    <Compile Include="Configuration\GeneratorConfigurationReader.cs" />
+    <Compile Include="Configuration\MsBuildProjectReader.cs" />
+    <Compile Include="Configuration\SpecFlowProject.cs" />
+    <Compile Include="UnitTestConverter\ISpecFlowUnitTestConverter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SpecFlowGenerator.cs" />
+    <Compile Include="SpecFlowUnitTestConverter.cs" />
+    <Compile Include="UnitTestProvider\MsTestSilverlightGeneratorProvider.cs" />
+    <Compile Include="UnitTestProvider\MbUnitTestGeneratorProvider.cs" />
+    <Compile Include="UnitTestProvider\XUnitTestGeneratorProvider.cs" />
+    <Compile Include="UnitTestProvider\IUnitTestGeneratorProvider.cs" />
+    <Compile Include="UnitTestProvider\MsTestGeneratorProvider.cs" />
+    <Compile Include="UnitTestProvider\NUnitTestConverter.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Parser\TechTalk.SpecFlow.Parser.csproj">
+      <Project>{7CCEF6D6-FC17-422E-9BED-EDD752B6496F}</Project>
+      <Name>TechTalk.SpecFlow.Parser</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/Generator/UnitTestProvider/MsTestSilverlightGeneratorProvider.cs b/Generator/UnitTestProvider/MsTestSilverlightGeneratorProvider.cs
new file mode 100755
index 000000000..aa0231d9e
--- /dev/null
+++ b/Generator/UnitTestProvider/MsTestSilverlightGeneratorProvider.cs
@@ -0,0 +1,124 @@
+using System.CodeDom;
+using System.Collections.Generic;
+
+namespace TechTalk.SpecFlow.Generator.UnitTestProvider
+{
+    // TODO: it's an ugly copy-paste of MsTestGeneratorProvider - we should consider refactoring the generator creation to support custom factories.
+    public class MsTestSilverlightGeneratorProvider : IUnitTestGeneratorProvider
+    {
+        private const string TESTFIXTURE_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute";
+        private const string TEST_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute";
+        private const string PROPERTY_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute";
+        private const string TESTFIXTURESETUP_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute";
+        private const string TESTFIXTURETEARDOWN_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute";
+        private const string TESTSETUP_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute";
+        private const string TESTTEARDOWN_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute";
+        private const string IGNORE_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.IgnoreAttribute";
+        private const string DESCRIPTION_ATTR = "Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute";
+
+        private const string FEATURE_TITILE_PROPERTY_NAME = "FeatureTitle";
+        private const string FEATURE_TITILE_KEY = "FeatureTitle";
+
+        private const string TESTCONTEXT_TYPE = "Microsoft.VisualStudio.TestTools.UnitTesting.TestContext";
+
+        private CodeTypeDeclaration currentTestTypeDeclaration = null;
+
+        public void SetTestFixture(CodeTypeDeclaration typeDeclaration, string title, string description)
+        {
+            typeDeclaration.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TESTFIXTURE_ATTR)));
+
+            //as in mstest, you cannot mark classes with the description attribute, we
+            //just remember the feature title, and we will apply it for each test method
+            typeDeclaration.UserData[FEATURE_TITILE_KEY] = title;
+
+            currentTestTypeDeclaration = typeDeclaration;
+        }
+
+        private void SetDescription(CodeAttributeDeclarationCollection customAttributes, string description)
+        {
+            customAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(DESCRIPTION_ATTR),
+                    new CodeAttributeArgument(
+                        new CodePrimitiveExpression(description))));
+        }
+
+        private void SetProperty(CodeAttributeDeclarationCollection customAttributes, string name, string value)
+        {
+            customAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(PROPERTY_ATTR),
+                    new CodeAttributeArgument(
+                        new CodePrimitiveExpression(name)),
+                    new CodeAttributeArgument(
+                        new CodePrimitiveExpression(value))));
+        }
+
+        public void SetTestFixtureCategories(CodeTypeDeclaration typeDeclaration, IEnumerable<string> categories)
+        {
+            //MsTest does not support caregories... :(
+        }
+
+        public void SetTest(CodeMemberMethod memberMethod, string title)
+        {
+            memberMethod.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TEST_ATTR)));
+
+            SetDescription(memberMethod.CustomAttributes, title);
+
+            if (currentTestTypeDeclaration == null)
+                return;
+
+            string featureTitle = currentTestTypeDeclaration.UserData[FEATURE_TITILE_KEY] as string;
+            if (featureTitle != null)
+                SetProperty(memberMethod.CustomAttributes, FEATURE_TITILE_PROPERTY_NAME, featureTitle);
+        }
+
+        public void SetTestCategories(CodeMemberMethod memberMethod, IEnumerable<string> categories)
+        {
+            //MsTest does not support caregories... :(
+        }
+
+        public void SetTestSetup(CodeMemberMethod memberMethod)
+        {
+            memberMethod.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TESTSETUP_ATTR)));
+        }
+
+        public void SetTestFixtureSetup(CodeMemberMethod memberMethod)
+        {
+            memberMethod.Attributes |= MemberAttributes.Static;
+
+            memberMethod.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TESTFIXTURESETUP_ATTR)));
+        }
+
+        public void SetTestFixtureTearDown(CodeMemberMethod memberMethod)
+        {
+            memberMethod.Attributes |= MemberAttributes.Static;
+
+            memberMethod.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TESTFIXTURETEARDOWN_ATTR)));
+        }
+
+        public void SetTestTearDown(CodeMemberMethod memberMethod)
+        {
+            memberMethod.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(TESTTEARDOWN_ATTR)));
+        }
+
+        public void SetIgnore(CodeTypeMember codeTypeMember)
+        {
+            codeTypeMember.CustomAttributes.Add(
+                new CodeAttributeDeclaration(
+                    new CodeTypeReference(IGNORE_ATTR)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Installer/SpecFlowInstaller/Common.wxi b/Installer/SpecFlowInstaller/Common.wxi
index 25b33b64a..e6ea46dc9 100644
--- a/Installer/SpecFlowInstaller/Common.wxi
+++ b/Installer/SpecFlowInstaller/Common.wxi
@@ -8,5 +8,6 @@
   <?define CLSID_SpecFlowSingleFileGenerator = "{3c9cf10a-a9ab-4899-a0fb-4b3be4a36c15}" ?>
   <?define VBLangId = "{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ?>
   <?define CSharpLangId = "{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}" ?>
+  <?define SilverlightPackageId = "{CB22EE0E-4072-4ae7-96E2-90FCCF879544}" ?>
 
 </Include>
diff --git a/Installer/SpecFlowInstaller/Product.Generated.wxs b/Installer/SpecFlowInstaller/Product.Generated.wxs
index 8c6815581..8cc2898fd 100644
--- a/Installer/SpecFlowInstaller/Product.Generated.wxs
+++ b/Installer/SpecFlowInstaller/Product.Generated.wxs
@@ -1,13 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Fragment>
-    <ComponentGroup Id="Product.Generated">
-      <ComponentGroupRef Id="TechTalk.SpecFlow.Generator.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.Parser.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.Reporting.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.Tools.Binaries" />
-      <ComponentGroupRef Id="TechTalk.SpecFlow.VsIntegration.Binaries" />
-    </ComponentGroup>
-  </Fragment>
+<?xml version='1.0' encoding='UTF-8'?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <ComponentGroup Id="Product.Generated">
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Generator.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Parser.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Reporting.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Silverlight.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Silverlight.Content" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Silverlight.Satellites" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.Tools.Binaries" />
+      <ComponentGroupRef Id="TechTalk.SpecFlow.VsIntegration.Binaries" />
+    </ComponentGroup>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj b/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj
index 25456bb47..2a66a6bd1 100644
--- a/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj
+++ b/Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj
@@ -1,92 +1,99 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.5</ProductVersion>
-    <ProjectGuid>{89167eb9-f458-48da-9d8f-f639a74f5871}</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>SpecFlowSetup</OutputName>
-    <OutputType>Package</OutputType>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="VS2010.wxs" />
-    <Compile Include="CoreFiles.wxs" />
-    <Compile Include="Product.wxs" />
-    <Compile Include="Product.Generated.wxs">
-      <DependentUpon>Product.wxs</DependentUpon>
-      <GenerateComponentGroups>True</GenerateComponentGroups>
-    </Compile>
-    <Compile Include="VS2008.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Generator\TechTalk.SpecFlow.Generator.csproj">
-      <Name>TechTalk.SpecFlow.Generator</Name>
-      <Project>{453d8014-b6cd-4e86-80a8-d59f59092334}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Parser\TechTalk.SpecFlow.Parser.csproj">
-      <Name>TechTalk.SpecFlow.Parser</Name>
-      <Project>{7ccef6d6-fc17-422e-9bed-edd752b6496f}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Reporting\TechTalk.SpecFlow.Reporting.csproj">
-      <Name>TechTalk.SpecFlow.Reporting</Name>
-      <Project>{fc43509f-e7d3-40c4-b4c3-1e6c9d5530a4}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Runtime\TechTalk.SpecFlow.csproj">
-      <Name>TechTalk.SpecFlow</Name>
-      <Project>{413ee28c-4f89-4c6f-ba1e-2cdee4cd43b4}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Tools\TechTalk.SpecFlow.Tools.csproj">
-      <Name>TechTalk.SpecFlow.Tools</Name>
-      <Project>{87be7fe6-c3de-4409-abf6-fa5b60af3de1}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\VsIntegration\TechTalk.SpecFlow.VsIntegration.csproj">
-      <Name>TechTalk.SpecFlow.VsIntegration</Name>
-      <Project>{5703ca95-a08a-46ae-ae24-db6b21fd6f7e}</Project>
-      <Private>True</Private>
-      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixVSExtension">
-      <HintPath>$(WixExtDir)\WixVSExtension.dll</HintPath>
-      <Name>WixVSExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Common.wxi" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{89167eb9-f458-48da-9d8f-f639a74f5871}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>SpecFlowSetup</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="VS2010.wxs" />
+    <Compile Include="CoreFiles.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="Product.Generated.wxs">
+      <DependentUpon>Product.wxs</DependentUpon>
+      <GenerateComponentGroups>True</GenerateComponentGroups>
+    </Compile>
+    <Compile Include="VS2008.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Generator\TechTalk.SpecFlow.Generator.csproj">
+      <Name>TechTalk.SpecFlow.Generator</Name>
+      <Project>{453d8014-b6cd-4e86-80a8-d59f59092334}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Parser\TechTalk.SpecFlow.Parser.csproj">
+      <Name>TechTalk.SpecFlow.Parser</Name>
+      <Project>{7ccef6d6-fc17-422e-9bed-edd752b6496f}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Reporting\TechTalk.SpecFlow.Reporting.csproj">
+      <Name>TechTalk.SpecFlow.Reporting</Name>
+      <Project>{fc43509f-e7d3-40c4-b4c3-1e6c9d5530a4}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Runtime.Silverlight\TechTalk.SpecFlow.Silverlight.csproj">
+      <Name>TechTalk.SpecFlow.Silverlight</Name>
+      <Project>{b93f95cf-bf89-4d92-bb0f-86885b9b6dce}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Runtime\TechTalk.SpecFlow.csproj">
+      <Name>TechTalk.SpecFlow</Name>
+      <Project>{413ee28c-4f89-4c6f-ba1e-2cdee4cd43b4}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tools\TechTalk.SpecFlow.Tools.csproj">
+      <Name>TechTalk.SpecFlow.Tools</Name>
+      <Project>{87be7fe6-c3de-4409-abf6-fa5b60af3de1}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\VsIntegration\TechTalk.SpecFlow.VsIntegration.csproj">
+      <Name>TechTalk.SpecFlow.VsIntegration</Name>
+      <Project>{5703ca95-a08a-46ae-ae24-db6b21fd6f7e}</Project>
+      <Private>True</Private>
+      <RefProjectOutputGroups>Binaries</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixVSExtension">
+      <HintPath>$(WixExtDir)\WixVSExtension.dll</HintPath>
+      <Name>WixVSExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Common.wxi" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
@@ -94,5 +101,5 @@
 	</Target>
 	<Target Name="AfterBuild">
 	</Target>
-	-->
+	-->
 </Project>
\ No newline at end of file
diff --git a/Installer/SpecFlowInstaller/VS2010.wxs b/Installer/SpecFlowInstaller/VS2010.wxs
index c53385cda..e1114caca 100644
--- a/Installer/SpecFlowInstaller/VS2010.wxs
+++ b/Installer/SpecFlowInstaller/VS2010.wxs
@@ -72,6 +72,16 @@
           <RegistryValue Name="CLSID" Value="$(var.CLSID_SpecFlowSingleFileGenerator)" Type="string" />
           <RegistryValue Name="GeneratesDesignTimeSource" Value="1" Type="integer" />
         </RegistryKey>
+
+        <!-- Silverlight registration -->
+        <RegistryKey Root="HKLM" Key="$(var.Vs2010RegPath)\Generators\$(var.SilverlightPackageId)\.feature" Action="createAndRemoveOnUninstall">
+          <RegistryValue Value="SpecFlowSingleFileGenerator" Type="string" />
+        </RegistryKey>
+        <RegistryKey Root="HKLM" Key="$(var.Vs2010RegPath)\Generators\$(var.SilverlightPackageId)\SpecFlowSingleFileGenerator" Action="createAndRemoveOnUninstall">
+          <RegistryValue Value="Silverlight SpecFlow Generator" Type="string" />
+          <RegistryValue Name="CLSID" Value="$(var.CLSID_SpecFlowSingleFileGenerator)" Type="string" />
+          <RegistryValue Name="GeneratesDesignTimeSource" Value="1" Type="integer" />
+        </RegistryKey>
       </Component>
     </DirectoryRef>
   </Fragment>