Merge pull request #59 from kendaleiv/move-range-into-filter

Move Range into Filter

Author: khalidabuhakmeh

Filter.sln

@@ -1,14 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D26BB0C9-295E-4F30-90FA-532CAFA73A7D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Range", "src\Range\Range.csproj", "{0E804077-79B6-4E0F-A4BB-AD5F6EC194B3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Range.Tests", "tests\Range.Tests\Range.Tests.csproj", "{3A86B628-26DC-4E27-B688-7ED3DCA21EEB}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filter", "src\Filter\Filter.csproj", "{78EA264D-1EAB-4D55-BAD1-71F2D3DE1A2A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filter.Tests", "tests\Filter.Tests\Filter.Tests.csproj", "{A5283D85-C24D-467A-8B29-315320E5F80F}"
@@ -29,14 +25,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0E804077-79B6-4E0F-A4BB-AD5F6EC194B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E804077-79B6-4E0F-A4BB-AD5F6EC194B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E804077-79B6-4E0F-A4BB-AD5F6EC194B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E804077-79B6-4E0F-A4BB-AD5F6EC194B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A86B628-26DC-4E27-B688-7ED3DCA21EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A86B628-26DC-4E27-B688-7ED3DCA21EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A86B628-26DC-4E27-B688-7ED3DCA21EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A86B628-26DC-4E27-B688-7ED3DCA21EEB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78EA264D-1EAB-4D55-BAD1-71F2D3DE1A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{78EA264D-1EAB-4D55-BAD1-71F2D3DE1A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{78EA264D-1EAB-4D55-BAD1-71F2D3DE1A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,9 +54,11 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{3A86B628-26DC-4E27-B688-7ED3DCA21EEB} = {D26BB0C9-295E-4F30-90FA-532CAFA73A7D}
 		{A5283D85-C24D-467A-8B29-315320E5F80F} = {D26BB0C9-295E-4F30-90FA-532CAFA73A7D}
 		{1EC8770C-D078-45CA-B9CA-44FE3C66136D} = {86DCF3A9-55B1-48EB-B5E7-EF257718DA7D}
 		{2B4310E6-CD36-4BF7-9519-6CB6A7C8F2EA} = {D26BB0C9-295E-4F30-90FA-532CAFA73A7D}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {000D7362-598F-40B3-8D68-2436EA8FD8AC}
+	EndGlobalSection
 EndGlobal

samples/Range.Web.Http/Range.Web.Http.csproj

@@ -21,6 +21,8 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <LangVersion>latest</LangVersion>
+    <Use64BitIISExpress />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -104,10 +106,6 @@
       <Project>{494eb0e9-22ad-4840-9d7c-3c8d4ab36291}</Project>
       <Name>Range.Web.Http</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Range\Range.csproj">
-      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
-      <Name>Range</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />

src/Filter.Nest/Filter.Nest.csproj

@@ -66,9 +66,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Range\Range.csproj">
-      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
-      <Name>Range</Name>
+    <ProjectReference Include="..\Filter\Filter.csproj">
+      <Project>{78EA264D-1EAB-4D55-BAD1-71F2D3DE1A2A}</Project>
+      <Name>Filter</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Filter/Filter.csproj

@@ -43,13 +43,11 @@
     <Compile Include="Filter.cs" />
     <Compile Include="Generic\IEnumerable`1Extensions.cs" />
     <Compile Include="Generic\IQueryable`1Extensions.cs" />
+    <Compile Include="Generic\IRange`1.cs" />
+    <Compile Include="Generic\Range`1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Range\Range.csproj">
-      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
-      <Name>Range</Name>
-    </ProjectReference>
+    <Compile Include="Range.cs" />
+    <Compile Include="SmartConverter.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Range/Generic/IRange`1.cs src/Filter/Generic/IRange`1.cssrc/Range/Generic/IRange`1.cs renamed to src/Filter/Generic/IRange`1.cs

@@ -58,13 +58,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Range\Range.csproj">
-      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
-      <Name>Range</Name>
-    </ProjectReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\Filter\Filter.csproj">
+      <Project>{78ea264d-1eab-4d55-bad1-71f2d3de1a2a}</Project>
+      <Name>Filter</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.