refactoring

Packages/repositories.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
+  <repository path="..\..\Rainbow\src\Rainbow\packages.config" />
   <repository path="..\src\Unicorn.Remoting\packages.config" />
   <repository path="..\src\Unicorn.Tests\packages.config" />
   <repository path="..\src\Unicorn\packages.config" />

Unicorn.sln

@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Storage.Sc", "..\Ra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Storage.Yaml", "..\Rainbow\src\Rainbow.Storage.Yaml\Rainbow.Storage.Yaml.csproj", "{371181C9-45DC-4885-8894-43FFC235D124}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Diff", "..\Rainbow\src\Rainbow.Diff\Rainbow.Diff.csproj", "{A2259642-5E6B-4E80-8F48-269693A4DBE5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,10 +45,6 @@ Global
 		{371181C9-45DC-4885-8894-43FFC235D124}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{371181C9-45DC-4885-8894-43FFC235D124}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{371181C9-45DC-4885-8894-43FFC235D124}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2259642-5E6B-4E80-8F48-269693A4DBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2259642-5E6B-4E80-8F48-269693A4DBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2259642-5E6B-4E80-8F48-269693A4DBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2259642-5E6B-4E80-8F48-269693A4DBE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Unicorn.Tests/Unicorn.Tests.csproj

@@ -76,6 +76,10 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Rainbow\src\Rainbow\Rainbow.csproj">
+      <Project>{8ff75c8b-2a9e-4d95-91ad-333071813199}</Project>
+      <Name>Rainbow</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Unicorn\Unicorn.csproj">
       <Project>{82c4441b-e11e-4601-b6b7-c5ad71b2ab70}</Project>
       <Name>Unicorn</Name>

src/Unicorn/Data/ISerializableItemExtensions.cs

@@ -6,15 +6,6 @@ namespace Unicorn.Data
 {
 	public static class SerializableItemExtensions
 	{
-		/// <summary>
-		/// Helper method to get a specific version from a source item, if it exists
-		/// </summary>
-		/// <returns>Null if the version does not exist or the version if it exists</returns>
-		public static ISerializableVersion GetVersion(this ISerializableItem sourceItem, string language, int versionNumber)
-		{
-			return sourceItem.Versions.FirstOrDefault(x => x.Language.Name.Equals(language, StringComparison.OrdinalIgnoreCase) && x.VersionNumber == versionNumber);
-		}
-
 		public static string GetDisplayIdentifier(this ISerializableItem item)
 		{
 			return string.Format("{0}:{1} ({2})", item.DatabaseName, item.Path, item.Id);

src/Unicorn/Unicorn.csproj

@@ -81,9 +81,6 @@
     <Compile Include="Data\ISourceDataStore.cs" />
     <Compile Include="Data\ITargetDataStore.cs" />
     <Compile Include="Deserialization\DefaultDeserializerLogger.cs" />
-    <Compile Include="Evaluators\Comparison\DefaultComparison.cs" />
-    <Compile Include="Evaluators\Comparison\IFieldComparer.cs" />
-    <Compile Include="Evaluators\Comparison\XmlComparison.cs" />
     <Compile Include="Loader\DebugSerializationLoaderLogger.cs" />
     <Compile Include="Logging\ExceptionFormatter.cs" />
     <Compile Include="Logging\LoggingContext.cs" />
@@ -149,10 +146,6 @@
     <None Include="Unicorn.nuspec" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Diff\Rainbow.Diff.csproj">
-      <Project>{a2259642-5e6b-4e80-8f48-269693a4dbe5}</Project>
-      <Name>Rainbow.Diff</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Storage.Sc\Rainbow.Storage.Sc.csproj">
       <Project>{956afe8b-51cd-4d61-b8c1-bffdc749fd82}</Project>
       <Name>Rainbow.Storage.Sc</Name>