tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 02:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

website dotnet 2.2 版本升级

Browse Source
This commit is contained in:
hogan 2019-01-08 14:33:11 +08:00
parent 6ddd3c99a2
commit 676c0f07a7
8 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Examples/website/FreeSql.Site.DAL/DocumentTypeDAL.cs
View File

@ -1,4 +1,5 @@
using FreeSql.Site.Entity; //using FreeSql.Site.Entity;
using FreeSql.Site.Entity;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq.Expressions; using System.Linq.Expressions;

7
Examples/website/FreeSql.Site.DAL/FreeSql.Site.DAL.csproj
View File

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup> </ItemGroup>

3
Examples/website/FreeSql.Site.Entity/DocumentType.cs
View File

@ -1,4 +1,5 @@
using FreeSql.DataAnnotations; //using FreeSql.DataAnnotations;
using FreeSql.DataAnnotations;
using System; using System;
namespace FreeSql.Site.Entity namespace FreeSql.Site.Entity

2
Examples/website/FreeSql.Site.Entity/FreeSql.Site.Entity.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
Examples/website/FreeSql.Site.UI/Areas/Doc/Controllers/DocumentsController.cs
View File

@ -14,6 +14,7 @@ namespace FreeSql.Site.UI.Areas.Doc.Controllers
// GET: Documents // GET: Documents
public IActionResult Index() public IActionResult Index()
{ {
ViewBag.DocumentList = new FreeSql.Site.DAL.DocumentTypeDAL().Query(d => d.ID != 0);
return View(); return View();
} }

31
Examples/website/FreeSql.Site.UI/Areas/Doc/Views/Documents/Index.cshtml
View File

@ -5,31 +5,12 @@
<div class="site-tree"> <div class="site-tree">
<ul class="layui-tree"> <ul class="layui-tree">
<li><h2>基础说明</h2></li> <li><h2>基础说明</h2></li>
<li class="site-tree-noicon"> @foreach (var item in (List<FreeSql.Site.Entity.DocumentType>)ViewBag.DocumentList)
<a href="#1"><cite>开始方法</cite></a> {
</li> <li class="site-tree-noicon">
<li class="site-tree-noicon"> <a href="#1"><cite>@item.TypeName</cite></a>
<a href="#2"><cite>开始方法</cite></a> </li>
</li> }
<li class="site-tree-noicon">
<a href="#3"><cite>开始方法</cite></a>
</li>
<li class="site-tree-noicon">
<a href="#"><cite>开始方法</cite></a>
</li>
<li><h2>复杂应用</h2></li>
<li class="site-tree-noicon">
<a href="#"><cite>开始方法</cite></a>
</li>
<li class="site-tree-noicon">
<a href="#"><cite>开始方法</cite></a>
</li>
<li class="site-tree-noicon">
<a href="#"><cite>开始方法</cite></a>
</li>
<li class="site-tree-noicon">
<a href="#"><cite>开始方法</cite></a>
</li>
</ul> </ul>
</div> </div>
<div class="site-content"> <div class="site-content">

8
Examples/website/FreeSql.Site.UI/FreeSql.Site.UI.csproj
View File

@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -17,6 +16,11 @@
<Folder Include="Areas\Example\Models\" /> <Folder Include="Areas\Example\Models\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FreeSql.Site.DAL\FreeSql.Site.DAL.csproj" />
<ProjectReference Include="..\FreeSql.Site.Entity\FreeSql.Site.Entity.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="Areas\BBS\_ViewStart.cshtml"> <Content Update="Areas\BBS\_ViewStart.cshtml">
<Pack>$(IncludeRazorContentInPack)</Pack> <Pack>$(IncludeRazorContentInPack)</Pack>

84
FreeSql.sln
View File

@ -25,11 +25,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{49
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "website", "website", "{A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "website", "website", "{A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}"
EndProject 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 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 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution 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|x64.Build.0 = Release|Any CPU
{6DC39740-0B26-4029-AB75-D436A7F666A2}.Release|x86.ActiveCfg = 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 {6DC39740-0B26-4029-AB75-D436A7F666A2}.Release|x86.Build.0 = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x64.ActiveCfg = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x64.ActiveCfg = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x64.Build.0 = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x64.Build.0 = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x86.ActiveCfg = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x86.ActiveCfg = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Debug|x86.Build.0 = Debug|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Debug|x86.Build.0 = Debug|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|Any CPU.Build.0 = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|Any CPU.Build.0 = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x64.ActiveCfg = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x64.ActiveCfg = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x64.Build.0 = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x64.Build.0 = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x86.ActiveCfg = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x86.ActiveCfg = Release|Any CPU
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901}.Release|x86.Build.0 = Release|Any CPU {6B896261-1204-4AC3-AAD6-6BE49CDFF116}.Release|x86.Build.0 = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x64.ActiveCfg = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x64.Build.0 = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x64.Build.0 = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x86.ActiveCfg = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Debug|x86.Build.0 = Debug|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Debug|x86.Build.0 = Debug|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|Any CPU.ActiveCfg = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|Any CPU.Build.0 = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|Any CPU.Build.0 = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x64.ActiveCfg = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x64.ActiveCfg = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x64.Build.0 = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x64.Build.0 = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x86.ActiveCfg = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x86.ActiveCfg = Release|Any CPU
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0}.Release|x86.Build.0 = Release|Any CPU {1ED1539C-5229-443C-9CEE-F4D22CCD54D2}.Release|x86.Build.0 = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x64.ActiveCfg = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x64.ActiveCfg = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x64.Build.0 = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x64.Build.0 = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x86.ActiveCfg = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x86.ActiveCfg = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Debug|x86.Build.0 = Debug|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Debug|x86.Build.0 = Debug|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|Any CPU.Build.0 = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|Any CPU.Build.0 = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x64.ActiveCfg = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x64.ActiveCfg = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x64.Build.0 = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x64.Build.0 = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x86.ActiveCfg = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x86.ActiveCfg = Release|Any CPU
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8}.Release|x86.Build.0 = Release|Any CPU {3F50F8D4-FC41-40A3-8D45-CB915C5406F3}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} = {492E3483-3DE2-4134-B481-9AE838B231FA} {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} = {492E3483-3DE2-4134-B481-9AE838B231FA}
{ADE34300-CB28-4EE9-8BC3-E2D95A4F4901} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} {6B896261-1204-4AC3-AAD6-6BE49CDFF116} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}
{EB34E83B-4E34-4293-BA1A-8A5B99272EB0} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} {1ED1539C-5229-443C-9CEE-F4D22CCD54D2} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}
{503A48B4-E31E-4708-9D27-0BE87F7FEEC8} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B} {3F50F8D4-FC41-40A3-8D45-CB915C5406F3} = {A42B81B8-550F-4A57-9C0D-BF1F565F9C0B}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98} SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}