diff --git a/Examples/website/FreeSql.Site.DAL/DocumentTypeDAL.cs b/Examples/website/FreeSql.Site.DAL/DocumentTypeDAL.cs index 9a6c2e11..a7c204fa 100644 --- a/Examples/website/FreeSql.Site.DAL/DocumentTypeDAL.cs +++ b/Examples/website/FreeSql.Site.DAL/DocumentTypeDAL.cs @@ -1,4 +1,5 @@ -using FreeSql.Site.Entity; +//using FreeSql.Site.Entity; +using FreeSql.Site.Entity; using System; using System.Collections.Generic; using System.Linq.Expressions; diff --git a/Examples/website/FreeSql.Site.DAL/FreeSql.Site.DAL.csproj b/Examples/website/FreeSql.Site.DAL/FreeSql.Site.DAL.csproj index 096a7646..62785d34 100644 --- a/Examples/website/FreeSql.Site.DAL/FreeSql.Site.DAL.csproj +++ b/Examples/website/FreeSql.Site.DAL/FreeSql.Site.DAL.csproj @@ -1,13 +1,12 @@ - netcoreapp2.1 + netcoreapp2.2 - - - + + diff --git a/Examples/website/FreeSql.Site.Entity/DocumentType.cs b/Examples/website/FreeSql.Site.Entity/DocumentType.cs index 310c47c5..2f9f92e5 100644 --- a/Examples/website/FreeSql.Site.Entity/DocumentType.cs +++ b/Examples/website/FreeSql.Site.Entity/DocumentType.cs @@ -1,4 +1,5 @@ -using FreeSql.DataAnnotations; +//using FreeSql.DataAnnotations; +using FreeSql.DataAnnotations; using System; namespace FreeSql.Site.Entity diff --git a/Examples/website/FreeSql.Site.Entity/FreeSql.Site.Entity.csproj b/Examples/website/FreeSql.Site.Entity/FreeSql.Site.Entity.csproj index 5f3e382a..7716db12 100644 --- a/Examples/website/FreeSql.Site.Entity/FreeSql.Site.Entity.csproj +++ b/Examples/website/FreeSql.Site.Entity/FreeSql.Site.Entity.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 diff --git a/Examples/website/FreeSql.Site.UI/Areas/Doc/Controllers/DocumentsController.cs b/Examples/website/FreeSql.Site.UI/Areas/Doc/Controllers/DocumentsController.cs index f63c6f2d..31bacce1 100644 --- a/Examples/website/FreeSql.Site.UI/Areas/Doc/Controllers/DocumentsController.cs +++ b/Examples/website/FreeSql.Site.UI/Areas/Doc/Controllers/DocumentsController.cs @@ -14,6 +14,7 @@ namespace FreeSql.Site.UI.Areas.Doc.Controllers // GET: Documents public IActionResult Index() { + ViewBag.DocumentList = new FreeSql.Site.DAL.DocumentTypeDAL().Query(d => d.ID != 0); return View(); } diff --git a/Examples/website/FreeSql.Site.UI/Areas/Doc/Views/Documents/Index.cshtml b/Examples/website/FreeSql.Site.UI/Areas/Doc/Views/Documents/Index.cshtml index 641b039a..6cbee870 100644 --- a/Examples/website/FreeSql.Site.UI/Areas/Doc/Views/Documents/Index.cshtml +++ b/Examples/website/FreeSql.Site.UI/Areas/Doc/Views/Documents/Index.cshtml @@ -5,31 +5,12 @@
diff --git a/Examples/website/FreeSql.Site.UI/FreeSql.Site.UI.csproj b/Examples/website/FreeSql.Site.UI/FreeSql.Site.UI.csproj index f1b80090..f1aa89c0 100644 --- a/Examples/website/FreeSql.Site.UI/FreeSql.Site.UI.csproj +++ b/Examples/website/FreeSql.Site.UI/FreeSql.Site.UI.csproj @@ -1,12 +1,11 @@ - netcoreapp2.1 + netcoreapp2.2 - @@ -17,6 +16,11 @@ + + + + + $(IncludeRazorContentInPack) diff --git a/FreeSql.sln b/FreeSql.sln index d7a0c69c..bf3567df 100644 --- a/FreeSql.sln +++ b/FreeSql.sln @@ -25,11 +25,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{49 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "website", "website", "{A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Site.DAL", "Examples\website\FreeSql.Site.DAL\FreeSql.Site.DAL.csproj", "{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Site.UI", "Examples\website\FreeSql.Site.UI\FreeSql.Site.UI.csproj", "{6B896261-1204-4AC3-AAD6-6BE49CDFF116}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Site.Entity", "Examples\website\FreeSql.Site.Entity\FreeSql.Site.Entity.csproj", "{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Site.Entity", "Examples\website\FreeSql.Site.Entity\FreeSql.Site.Entity.csproj", "{1ED1539C-5229-443C-9CEE-F4D22CCD54D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Site.UI", "Examples\website\FreeSql.Site.UI\FreeSql.Site.UI.csproj", "{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Site.DAL", "Examples\website\FreeSql.Site.DAL\FreeSql.Site.DAL.csproj", "{3F50F8D4-FC41-40A3-8D45-CB915C5406F3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,51 +77,51 @@ Global {6DC39740-0B26-4029-AB75-D436A7F666A2}.Release|x64.Build.0 = Release|Any CPU {6DC39740-0B26-4029-AB75-D436A7F666A2}.Release|x86.ActiveCfg = Release|Any CPU {6DC39740-0B26-4029-AB75-D436A7F666A2}.Release|x86.Build.0 = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x64.ActiveCfg = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x64.Build.0 = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x86.ActiveCfg = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x86.Build.0 = Debug|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|Any CPU.Build.0 = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x64.ActiveCfg = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x64.Build.0 = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x86.ActiveCfg = Release|Any CPU - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x86.Build.0 = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x64.Build.0 = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x86.Build.0 = Debug|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|Any CPU.Build.0 = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x64.ActiveCfg = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x64.Build.0 = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x86.ActiveCfg = Release|Any CPU - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x86.Build.0 = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x64.ActiveCfg = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x64.Build.0 = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x86.ActiveCfg = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x86.Build.0 = Debug|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|Any CPU.Build.0 = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x64.ActiveCfg = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x64.Build.0 = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x86.ActiveCfg = Release|Any CPU - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x86.Build.0 = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x64.ActiveCfg = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x64.Build.0 = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x86.Build.0 = Debug|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|Any CPU.Build.0 = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x64.ActiveCfg = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x64.Build.0 = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x86.ActiveCfg = Release|Any CPU + {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x86.Build.0 = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x64.ActiveCfg = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x64.Build.0 = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x86.ActiveCfg = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x86.Build.0 = Debug|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|Any CPU.Build.0 = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x64.ActiveCfg = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x64.Build.0 = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x86.ActiveCfg = Release|Any CPU + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x86.Build.0 = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x64.Build.0 = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x86.Build.0 = Debug|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|Any CPU.Build.0 = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x64.ActiveCfg = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x64.Build.0 = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x86.ActiveCfg = Release|Any CPU + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} = {492E3483-3DE2-4134-B481-9AE838B231FA} - {ADE34300-CB28-4EE9-8BC3-E2D95A4F4901} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} - {EB34E83B-4E34-4293-BA1A-8A5B99272EB0} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} - {503A48B4-E31E-4708-9D27-0BE87F7FEEC8} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} + {6B896261-1204-4AC3-AAD6-6BE49CDFF116} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} + {1ED1539C-5229-443C-9CEE-F4D22CCD54D2} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} + {3F50F8D4-FC41-40A3-8D45-CB915C5406F3} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}