website dotnet 2.2 版本升级

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

View File

@ -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;

View File

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

View File

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

View File

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

View File

@ -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();
}

View File

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

View File

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