Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dotnet core rc2 support and split into multiple versions/flavors #33

Merged
merged 4 commits into from
Jun 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 223 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,236 @@
*.[Rr]e[Ss]harper
*[Rr]e[Ss]harper.user
_[Rr]e[Ss]harper.*/
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

[Ss]tyle[Cc]op.[Cc]ache
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Bb]uild/
[Dd]ist/
[Cc]lient[Bb]in/
[Pp]ublish/
[Pp]ackages/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

*.suo
*.sln.cache
*.user
*.vssscc
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.[Pp]ublish.xml
*.vssscc
.builds
*.pidb
*.svclog
*.scc

[Tt]est[Rr]esults/
[Tt]est[Rr]esult.xml
# Chutzpah Test files
_Chutzpah*

*.dotCover
*.ndproj
/NDependOut
.idea
.dbshell
*.vspx
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
*/*.ide/*
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config

# Windows Store app package directory
AppPackages/
BundleArtifacts/

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe

# FAKE - F# Make
.fake/
81 changes: 81 additions & 0 deletions LinqKit Solution.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F7F283D-5576-417F-A467-EC210226AC3B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9FC09568-C879-47D8-9D28-E736B8A84C95}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
README.md = README.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqKit.EntityFramework", "src-dotnet-core\LinqKit.EntityFramework\LinqKit.EntityFramework.xproj", "{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src-original", "src-original", "{BF05142E-19C4-4359-9AAF-7A4EC2F27942}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit", "src\LinqKit.csproj", "{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Net35", "src\LinqKit.Net35.csproj", "{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0BE21A11-8EF0-404B-AFC0-533A62386C4C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{4521E792-157C-4049-ADF0-CDA31EFC3CC7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "src\Demo\Demo.csproj", "{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Tests", "src\Tests\LinqKit.Tests.csproj", "{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqKit.Microsoft.EntityFrameworkCore", "src-dotnet-core\LinqKit.Microsoft.EntityFrameworkCore\LinqKit.Microsoft.EntityFrameworkCore.xproj", "{F9861A91-C2E4-4D20-B486-89272898FE23}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqKit", "src-dotnet-core\LinqKit\LinqKit.xproj", "{667345EE-B154-432F-A908-CB6374805C20}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD}.Release|Any CPU.Build.0 = Release|Any CPU
{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6}.Release|Any CPU.Build.0 = Release|Any CPU
{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0}.Release|Any CPU.Build.0 = Release|Any CPU
{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3}.Release|Any CPU.Build.0 = Release|Any CPU
{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09}.Release|Any CPU.Build.0 = Release|Any CPU
{F9861A91-C2E4-4D20-B486-89272898FE23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9861A91-C2E4-4D20-B486-89272898FE23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9861A91-C2E4-4D20-B486-89272898FE23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9861A91-C2E4-4D20-B486-89272898FE23}.Release|Any CPU.Build.0 = Release|Any CPU
{667345EE-B154-432F-A908-CB6374805C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{667345EE-B154-432F-A908-CB6374805C20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{667345EE-B154-432F-A908-CB6374805C20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{667345EE-B154-432F-A908-CB6374805C20}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{CFF0D30F-9AF2-4F3D-8458-167C5CC430FD} = {2F7F283D-5576-417F-A467-EC210226AC3B}
{AEC98F52-83F5-488D-99EF-8AFFE7C9F6E6} = {BF05142E-19C4-4359-9AAF-7A4EC2F27942}
{E6DA2678-2910-4EA4-B9F8-180E6BFD87B0} = {BF05142E-19C4-4359-9AAF-7A4EC2F27942}
{AA8FD6A3-D1D1-49B6-8ED4-388E94E4F2F3} = {4521E792-157C-4049-ADF0-CDA31EFC3CC7}
{A8A8E0D9-CC31-4B84-9ED2-2B808C9F0B09} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
{F9861A91-C2E4-4D20-B486-89272898FE23} = {2F7F283D-5576-417F-A467-EC210226AC3B}
{667345EE-B154-432F-A908-CB6374805C20} = {2F7F283D-5576-417F-A467-EC210226AC3B}
EndGlobalSection
EndGlobal
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[![Build status](https://ci.appveyor.com/api/projects/status/github/scottksmith95/LINQKit)](https://ci.appveyor.com/project/Thorium/linqkit)
[![Build status](https://ci.appveyor.com/api/projects/status/0c4v2bsvdqd57600?svg=true)](https://ci.appveyor.com/project/StefH/system-linq-dynamic-core)

EntityFramework.LinqKit
[![Version](https://img.shields.io/nuget/v/EntityFramework.LinqKit.svg)](https://www.nuget.org/packages/EntityFramework.LinqKit)

Microsoft.EntityFrameworkCore.LinqKit
[![Version](https://img.shields.io/nuget/v/Microsoft.EntityFrameworkCore.LinqKit.svg)](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.LinqKit)

What is LINQKit?
=======
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview1-002702"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>

<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>cff0d30f-9af2-4f3d-8458-167c5cc430fd</ProjectGuid>
<RootNamespace>LINQKit</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
Loading