From 2597516baf50138fda398446cb8578413ab2cc24 Mon Sep 17 00:00:00 2001
From: Heather <heather@cynede.net>
Date: Wed, 20 Nov 2013 11:53:16 +0400
Subject: [PATCH] FAKE build, Fuchu test

---
 .gitignore                          |  11 +-
 Failess.sln                         | 124 ++++++++++---------
 build.cmd                           |  22 +---
 build.fsx                           |  46 +++++++
 {tools => packages}/NuGet/NuGet.exe | Bin
 src/app/FailLib/FailLib.fsproj      | 142 ++++++++++-----------
 src/app/FailTests/CSSConverter.fs   |  18 +++
 src/app/FailTests/FailTests.fsproj  |  86 +++++++++++++
 src/app/FailTests/TestCSS.fs        |  57 +++++++++
 src/app/FailTests/packages.config   |   4 +
 src/app/Failess/Failess.fsproj      | 184 ++++++++++++++--------------
 src/app/FailessLib                  |   2 +-
 12 files changed, 457 insertions(+), 239 deletions(-)
 create mode 100644 build.fsx
 rename {tools => packages}/NuGet/NuGet.exe (100%)
 create mode 100644 src/app/FailTests/CSSConverter.fs
 create mode 100644 src/app/FailTests/FailTests.fsproj
 create mode 100644 src/app/FailTests/TestCSS.fs
 create mode 100644 src/app/FailTests/packages.config

diff --git a/.gitignore b/.gitignore
index e8b668b..adb0a89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,14 @@
 /build
+/src/app/Failess/bin
 /src/app/Failess/obj
+/src/app/FailLib/bin
+/src/app/FailLib/obj
+/src/app/FailTests/bin
+/src/app/FailTests/obj
+
 /*.suo
 /*.userprefs
-/Fail.sln
\ No newline at end of file
+
+packages/*
+!packages/NuGet
+!packages/repositories.conig
\ No newline at end of file
diff --git a/Failess.sln b/Failess.sln
index bffb23f..78c0754 100644
--- a/Failess.sln
+++ b/Failess.sln
@@ -1,56 +1,68 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.20617.1 PREVIEW
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Failess", "src\app\Failess\Failess.fsproj", "{CA923BCA-C273-4744-9658-7DF7001FF266}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FailessLib", "src\app\FailessLib\FailessLib.fsproj", "{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FailLib", "src\app\FailLib\FailLib.fsproj", "{49505BE7-ABD8-4307-A246-CCEAA3BEED83}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|x86.ActiveCfg = Release|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|x86.ActiveCfg = Release|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Failess", "src\app\Failess\Failess.fsproj", "{CA923BCA-C273-4744-9658-7DF7001FF266}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FailessLib", "src\app\FailessLib\FailessLib.fsproj", "{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FailLib", "src\app\FailLib\FailLib.fsproj", "{49505BE7-ABD8-4307-A246-CCEAA3BEED83}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FailTests", "src\app\FailTests\FailTests.fsproj", "{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CA923BCA-C273-4744-9658-7DF7001FF266}.Release|x86.ActiveCfg = Release|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E206A7D6-5E9B-496C-A661-CD4EF23A7A01}.Release|x86.ActiveCfg = Release|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{49505BE7-ABD8-4307-A246-CCEAA3BEED83}.Release|x86.ActiveCfg = Release|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0310969E-91C0-4E5B-99AC-BE5FC2AFF601}.Release|x86.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/build.cmd b/build.cmd
index 060052b..d29742f 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,26 +1,12 @@
 @echo off
-::Env
-if %PROCESSOR_ARCHITECTURE%==x86 (
-	set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
-) else (
-	set MSBUILD=%SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
-)
-
 cls
 SET EnableNuGetPackageRestore=true
 
-if not exist "tools\FAKE\tools\Fake.exe" (
-	"tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "tools" "-ExcludeVersion" "-Prerelease"
+if not exist "packages\FAKE\tools\Fake.exe" (
+	"packages\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion" "-Prerelease"
 	)
 
-::Clean
-rm -rf build
-mkdir build
-    
-::Build
-%MSBuild% Failess.sln  /p:Configuration=Release
-
-::F# 3.1
-XCOPY /e "%ProgramFiles%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll" "build"
+"packages\FAKE\tools\Fake.exe" "build.fsx"
 
+::Show output
 pause
\ No newline at end of file
diff --git a/build.fsx b/build.fsx
new file mode 100644
index 0000000..601235c
--- /dev/null
+++ b/build.fsx
@@ -0,0 +1,46 @@
+#I @"packages/FAKE/tools/"
+#r @"FakeLib.dll"
+
+open Fake
+open System
+open System.IO
+
+let buildDir = "./build"
+let nugetDir = "./packages"
+let packagesDir = "./packages"
+
+Target "Clean" (fun _ -> CleanDirs [buildDir])
+
+Target "RestorePackages" RestorePackages
+
+Target "BuildSolution" (fun _ ->
+    MSBuildWithDefaults "Build" ["./Failess.sln"]
+    |> Log "AppBuild-Output: "
+)
+
+Target "F# 3.1" (fun _ -> 
+    let programFiles = 
+        if (IntPtr.Size = 4)
+            then Environment.GetEnvironmentVariable("ProgramFiles")
+            else Environment.GetEnvironmentVariable("ProgramFiles(x86)")
+    (* Moving from F# 3.0 to F# 3.1 is hard... *)
+    sprintf @"%s\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll" programFiles
+    |> fun newCore -> if File.Exists newCore then 
+                        trace "-* Replacing 3.0 FSharp.Core.dll with 3.1 one\n"
+                        File.Copy(newCore, "build\FSharp.Core.dll", true)
+)
+
+Target "FailLib Tests" (fun _ -> 
+    trace "TODO: run fuchu tests from FAKE"
+)
+
+Target "Success" (fun _ -> ())
+
+"Clean"
+    ==> "RestorePackages"
+    ==> "BuildSolution"
+    ==> "F# 3.1"
+    ==> "FailLib Tests"
+    ==> "Success"
+
+RunTargetOrDefault "Success"
\ No newline at end of file
diff --git a/tools/NuGet/NuGet.exe b/packages/NuGet/NuGet.exe
similarity index 100%
rename from tools/NuGet/NuGet.exe
rename to packages/NuGet/NuGet.exe
diff --git a/src/app/FailLib/FailLib.fsproj b/src/app/FailLib/FailLib.fsproj
index bddaebe..7fd70e7 100644
--- a/src/app/FailLib/FailLib.fsproj
+++ b/src/app/FailLib/FailLib.fsproj
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{49505be7-abd8-4307-a246-cceaa3beed83}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>FailLib</RootNamespace>
-    <AssemblyName>FailLib</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <Name>FailLib</Name>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <Tailcalls>false</Tailcalls>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Debug\FailLib.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <Tailcalls>true</Tailcalls>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Release\FailLib.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeLib">
-      <HintPath>..\..\..\tools\FAKE\tools\FakeLib.dll</HintPath>
-    </Reference>
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FSI.Helper.fs" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '11.0'">
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\FSharp\Microsoft.FSharp.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>
-	-->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{49505be7-abd8-4307-a246-cceaa3beed83}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>FailLib</RootNamespace>
+    <AssemblyName>FailLib</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Name>FailLib</Name>
+    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Debug\FailLib.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\FailLib.XML</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FakeLib">
+      <HintPath>..\..\..\packages\FAKE\tools\FakeLib.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FSI.Helper.fs" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\FSharp\Microsoft.FSharp.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/src/app/FailTests/CSSConverter.fs b/src/app/FailTests/CSSConverter.fs
new file mode 100644
index 0000000..5438539
--- /dev/null
+++ b/src/app/FailTests/CSSConverter.fs
@@ -0,0 +1,18 @@
+open Fuchu
+open Failess
+open TestCSS
+
+open System
+open System.Text.RegularExpressions
+
+let convertTest = 
+    testCase "CSSConvert Test" <| 
+        fun _ -> Assert.Equal("ToFailess"
+            , failess
+            , ToFailess <| ( Array.toList <| Regex.Split(css, "\r\n") )
+            )
+            
+[<EntryPoint>]
+let main argv = 
+    run convertTest |> ignore
+    0 // return an integer exit code
diff --git a/src/app/FailTests/FailTests.fsproj b/src/app/FailTests/FailTests.fsproj
new file mode 100644
index 0000000..0b60b85
--- /dev/null
+++ b/src/app/FailTests/FailTests.fsproj
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>0310969e-91c0-4e5b-99ac-be5fc2aff601</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>FailTests</RootNamespace>
+    <AssemblyName>FailTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
+    <Name>FailTests</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\Debug\FailTests.XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\Release\FailTests.XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Fuchu">
+      <HintPath>..\..\..\packages\Fuchu.0.3.0.1\lib\net40-client\Fuchu.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TestCSS.fs" />
+    <Compile Include="CSSConverter.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FailessLib\FailessLib.fsproj">
+      <Name>FailessLib</Name>
+      <Project>{e206a7d6-5e9b-496c-a661-cd4ef23a7a01}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" />
+  <!-- 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/src/app/FailTests/TestCSS.fs b/src/app/FailTests/TestCSS.fs
new file mode 100644
index 0000000..397cc2d
--- /dev/null
+++ b/src/app/FailTests/TestCSS.fs
@@ -0,0 +1,57 @@
+module TestCSS
+
+let css = @"
+.mleft, .mright {
+    min-height: 500px;
+    margin-bottom: 10px;
+    text-align: center;
+    vertical-align: central;
+}
+.mleft {
+    float: left;
+    width: 59%;
+}
+.mright {
+    float: right;
+    width: 39%;
+}
+.RedColored {
+    background: #FF0000;
+}
+"
+
+let failess = @".mleft, .mright -| [
+            vertical-align-- central;
+            text-align-- center;
+            margin-bottom-- 10px;
+            min-height-- 500px;
+    ]
+.mleft -| [
+            width-- 59%;
+            float-- left;
+            vertical-align-- central;
+            text-align-- center;
+            margin-bottom-- 10px;
+            min-height-- 500px;
+    ]
+.mright -| [
+            width-- 39%;
+            float-- right;
+            width-- 59%;
+            float-- left;
+            vertical-align-- central;
+            text-align-- center;
+            margin-bottom-- 10px;
+            min-height-- 500px;
+    ]
+.RedColored -| [
+            background-- #FF0000;
+            width-- 39%;
+            float-- right;
+            width-- 59%;
+            float-- left;
+            vertical-align-- central;
+            text-align-- center;
+            margin-bottom-- 10px;
+            min-height-- 500px;
+    ]"
\ No newline at end of file
diff --git a/src/app/FailTests/packages.config b/src/app/FailTests/packages.config
new file mode 100644
index 0000000..fb8095c
--- /dev/null
+++ b/src/app/FailTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fuchu" version="0.3.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/app/Failess/Failess.fsproj b/src/app/Failess/Failess.fsproj
index cb04f37..c1eda9a 100644
--- a/src/app/Failess/Failess.fsproj
+++ b/src/app/Failess/Failess.fsproj
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CA923BCA-C273-4744-9658-7DF7001FF266}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Failess</RootNamespace>
-    <AssemblyName>Failess</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <Name>Failess</Name>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartArguments>build.fsx</StartArguments>
-    <PlatformTarget>x86</PlatformTarget>
-    <OtherFlags />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OtherFlags>
-    </OtherFlags>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Failess.fs" />
-    <Content Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="FakeLib">
-      <HintPath>..\..\..\tools\FAKE\tools\FakeLib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FailessLib\FailessLib.fsproj">
-      <Name>FailessLib</Name>
-      <Project>{e206a7d6-5e9b-496c-a661-cd4ef23a7a01}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\FailLib\FailLib.fsproj">
-      <Name>FailLib</Name>
-      <Project>{49505be7-abd8-4307-a246-cceaa3beed83}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '11.0'">
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\FSharp\Microsoft.FSharp.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>
-	-->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CA923BCA-C273-4744-9658-7DF7001FF266}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Failess</RootNamespace>
+    <AssemblyName>Failess</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <Name>Failess</Name>
+    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+    <StartWorkingDirectory>
+    </StartWorkingDirectory>
+    <StartArguments>build.fsx</StartArguments>
+    <PlatformTarget>x86</PlatformTarget>
+    <OtherFlags />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OtherFlags>
+    </OtherFlags>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Failess.fs" />
+    <Content Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="FakeLib">
+      <HintPath>..\..\..\packages\FAKE\tools\FakeLib.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FailessLib\FailessLib.fsproj">
+      <Name>FailessLib</Name>
+      <Project>{e206a7d6-5e9b-496c-a661-cd4ef23a7a01}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\FailLib\FailLib.fsproj">
+      <Name>FailLib</Name>
+      <Project>{49505be7-abd8-4307-a246-cceaa3beed83}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\FSharp\Microsoft.FSharp.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/src/app/FailessLib b/src/app/FailessLib
index d230bab..073e2bd 160000
--- a/src/app/FailessLib
+++ b/src/app/FailessLib
@@ -1 +1 @@
-Subproject commit d230babf17f90894f508f902f2d5b4f0b14b063a
+Subproject commit 073e2bd5d20c73736bf0a06eae0999c52835f400