innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: 重新梳理依赖组件依赖关系 

#Comment
移除对 newtonsoft.json 的依赖
This commit is contained in:
Argo Zhang 2019-10-12 14:54:24 +08:00
parent 89540ddfed
commit c58bbb8b77
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
7 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj
View File

@ -2,7 +2,6 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
</PropertyGroup>
<PropertyGroup>
@ -11,17 +10,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta7" />
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta9" />
<PackageReference Include="Longbow.Logging" Version="3.0.0" />
<PackageReference Include="Longbow.Tasks" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
<PackageReference Include="Sentry.AspNetCore" Version="2.0.0-beta4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
</ItemGroup>
<ItemGroup>

3
src/admin/Bootstrap.Admin/Controllers/Api/LoginController.cs
View File

@ -1,6 +1,5 @@
using Bootstrap.Admin.Query;
using Bootstrap.DataAccess;
using Bootstrap.Security.Authentication;
using Longbow.Web.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -39,7 +38,7 @@ namespace Bootstrap.Admin.Controllers.Api
string password = user.Password;
if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password) && UserHelper.Authenticate(userName, password))
{
token = BootstrapAdminJwtTokenHandler.CreateToken(userName);
token = "NOT Support yet!"; // BootstrapAdminJwtTokenHandler.CreateToken(userName);
}
HttpContext.Log(userName, token != null);
return token;

4
src/admin/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj
View File

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security" Version="1.8.0" />
<PackageReference Include="Bootstrap.Security" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
<PackageReference Include="MongoDB.Driver" Version="2.9.2" />
</ItemGroup>

17
src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
View File

@ -1,24 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0-beta1" />
<PackageReference Include="Longbow" Version="3.0.0-beta6" />
<PackageReference Include="Longbow.Cache" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
<PackageReference Include="Longbow.Data" Version="2.3.8" />
<PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" />
<PackageReference Include="Longbow.GitHubAuth" Version="2.2.0" />
<PackageReference Include="Longbow.OAuth" Version="3.0.0" />
<PackageReference Include="Longbow.GiteeAuth" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.GitHubAuth" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.OAuth" Version="3.0.1-beta1" />
<PackageReference Include="Longbow.PetaPoco" Version="1.0.2" />
<PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
<PackageReference Include="Longbow.Tasks" Version="2.2.24" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta3" />
<PackageReference Include="Longbow.WeChatAuth" Version="2.2.0" />
<PackageReference Include="Longbow.Tasks" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta4" />
<PackageReference Include="Longbow.WeChatAuth" Version="3.0.0-beta1" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
<PackageReference Include="PetaPoco.Extensions" Version="1.0.9" />
</ItemGroup>

3
src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
View File

@ -5,12 +5,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0-beta1" />
<PackageReference Include="Longbow" Version="3.0.0-beta6" />
<PackageReference Include="Longbow.Cache" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
<PackageReference Include="Longbow.Data" Version="2.3.8" />
<PackageReference Include="Longbow.Logging" Version="3.0.0" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta4" />
</ItemGroup>

5
src/client/Bootstrap.Client/Bootstrap.Client.csproj
View File

@ -2,12 +2,11 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta8" />
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta9" />
<PackageReference Include="Longbow.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
</ItemGroup>

1
src/client/Bootstrap.Client/Startup.cs
View File

@ -1,6 +1,5 @@
using Bootstrap.Client.DataAccess;
using Longbow.Web;
using Longbow.Web.SignalR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;