Update to core

mcintyre321 · Nov 17, 2016 · fc96e76 · fc96e76
1 parent 48654be
commit fc96e76
Show file tree

Hide file tree

Showing 15 changed files with 125 additions and 304 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 [Aa]pp_[Dd]ata*/
 packages
+/LinqToAnything/project.lock.json
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/LinqToAnything.Tests/App.config b/LinqToAnything.Tests/App.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="mssqllocaldb" />
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup></configuration>
diff --git a/LinqToAnything.Tests/LinqToAnything.Tests.csproj b/LinqToAnything.Tests/LinqToAnything.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToAnything.Tests</RootNamespace>
     <AssemblyName>LinqToAnything.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -35,45 +35,41 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DynamicLINQ">
-      <HintPath>..\packages\DynamicLINQ.1.0\lib\net40\DynamicLINQ.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Linq.Dynamic">
-      <HintPath>..\packages\System.Linq.Dynamic.1.0.0\lib\net40\System.Linq.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Tests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LinqToAnything\LinqToAnything.csproj">
-      <Project>{a4445a36-c2d6-4747-8f93-893bffd2ef76}</Project>
-      <Name>LinqToAnything</Name>
-    </ProjectReference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="LinqToAnything">
+      <HintPath>..\LinqToAnything\bin\Debug\net451\LinqToAnything.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QueryInterceptor.Core, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QueryInterceptor.Core.1.0.4.0\lib\net451\QueryInterceptor.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.8\lib\net451\System.Linq.Dynamic.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- 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">

diff --git a/LinqToAnything.Tests/Tests.cs b/LinqToAnything.Tests/Tests.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using NUnit.Framework;
 using LinqToAnything;
-using System.Linq.Dynamic;
+using System.Linq.Dynamic.Core;
 namespace LinqToAnything.Tests
 {
     [TestFixture]

diff --git a/LinqToAnything.Tests/packages.config b/LinqToAnything.Tests/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DynamicLINQ" version="1.0" targetFramework="net45" />
-  <package id="NUnit" version="2.6.2" targetFramework="net40" />
-  <package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />
+  <package id="EntityFramework" version="6.1.3" targetFramework="net451" />
+  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="QueryInterceptor.Core" version="1.0.4.0" targetFramework="net451" />
+  <package id="System.Linq.Dynamic.Core" version="1.0.6.8" targetFramework="net451" />
 </packages>
diff --git a/LinqToAnything.sln b/LinqToAnything.sln
@@ -1,32 +1,28 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToAnything", "LinqToAnything\LinqToAnything.csproj", "{A4445A36-C2D6-4747-8F93-893BFFD2EF76}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToAnything.Tests", "LinqToAnything.Tests\LinqToAnything.Tests.csproj", "{B592565D-E3BF-406D-A0DA-F508DBEC7854}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4163E8C6-7796-4145-934C-8DE641A970CE}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
+	ProjectSection(ProjectDependencies) = postProject
+		{0944BE53-451C-403A-A1DE-4696EA831166} = {0944BE53-451C-403A-A1DE-4696EA831166}
 	EndProjectSection
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqToAnything", "LinqToAnything\LinqToAnything.xproj", "{0944BE53-451C-403A-A1DE-4696EA831166}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4445A36-C2D6-4747-8F93-893BFFD2EF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4445A36-C2D6-4747-8F93-893BFFD2EF76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4445A36-C2D6-4747-8F93-893BFFD2EF76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4445A36-C2D6-4747-8F93-893BFFD2EF76}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B592565D-E3BF-406D-A0DA-F508DBEC7854}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B592565D-E3BF-406D-A0DA-F508DBEC7854}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B592565D-E3BF-406D-A0DA-F508DBEC7854}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B592565D-E3BF-406D-A0DA-F508DBEC7854}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0944BE53-451C-403A-A1DE-4696EA831166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0944BE53-451C-403A-A1DE-4696EA831166}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0944BE53-451C-403A-A1DE-4696EA831166}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0944BE53-451C-403A-A1DE-4696EA831166}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE