Skip to content

Commit

Permalink
fix line endings?
Browse files Browse the repository at this point in the history
  • Loading branch information
gasparnagy committed Jun 29, 2010
1 parent 1c2b235 commit d676ad2
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 114 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.CodeDom;
using System.Collections.Generic;

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.
Expand Down
30 changes: 15 additions & 15 deletions Installer/SpecFlowInstaller/Product.Generated.wxs
Original file line number Diff line number Diff line change
@@ -1,16 +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.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>
<?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>
194 changes: 97 additions & 97 deletions Installer/SpecFlowInstaller/SpecFlowInstaller.wixproj
Original file line number Diff line number Diff line change
@@ -1,105 +1,105 @@
<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)" />
<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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>

0 comments on commit d676ad2

Please sign in to comment.