From f0ade4748456fb33ce89ad912e8ce8085a75401b Mon Sep 17 00:00:00 2001 From: Fanyuepan Date: Mon, 13 Mar 2017 17:38:13 +0800 Subject: [PATCH 1/2] remove framework source and use nuget --- src/adminweb/DotNetLive.AdminWeb.sln | 28 ------------------- .../Controllers/AccountController.cs | 5 ++-- .../ServiceDependencyRegister.cs | 3 +- .../DotNetLive.AdminWeb.csproj | 7 ++--- .../Views/Shared/_LoginPartial.cshtml | 1 + 5 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/adminweb/DotNetLive.AdminWeb.sln b/src/adminweb/DotNetLive.AdminWeb.sln index 500c4a2..09d4b98 100644 --- a/src/adminweb/DotNetLive.AdminWeb.sln +++ b/src/adminweb/DotNetLive.AdminWeb.sln @@ -5,10 +5,6 @@ VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetLive.AdminWeb", "DotNetLive.AdminWeb\DotNetLive.AdminWeb.csproj", "{DA8A975D-2E3F-483E-9DC3-E7462C7D637D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetLive.Framework", "..\..\..\dotnetlive.framework\src\DotNetLive.Framework\DotNetLive.Framework.csproj", "{974276EC-8F64-457B-A295-608869DEABA3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetLive.Framework.WebApiClient", "..\..\..\dotnetlive.framework\src\DotNetLive.Framework.WebApiClient\DotNetLive.Framework.WebApiClient.csproj", "{B5765C54-1D4B-47C1-8779-F14323AF1EFB}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,30 +27,6 @@ Global {DA8A975D-2E3F-483E-9DC3-E7462C7D637D}.Release|x64.Build.0 = Release|x64 {DA8A975D-2E3F-483E-9DC3-E7462C7D637D}.Release|x86.ActiveCfg = Release|x86 {DA8A975D-2E3F-483E-9DC3-E7462C7D637D}.Release|x86.Build.0 = Release|x86 - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|x64.ActiveCfg = Debug|x64 - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|x64.Build.0 = Debug|x64 - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|x86.ActiveCfg = Debug|x86 - {974276EC-8F64-457B-A295-608869DEABA3}.Debug|x86.Build.0 = Debug|x86 - {974276EC-8F64-457B-A295-608869DEABA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {974276EC-8F64-457B-A295-608869DEABA3}.Release|Any CPU.Build.0 = Release|Any CPU - {974276EC-8F64-457B-A295-608869DEABA3}.Release|x64.ActiveCfg = Release|x64 - {974276EC-8F64-457B-A295-608869DEABA3}.Release|x64.Build.0 = Release|x64 - {974276EC-8F64-457B-A295-608869DEABA3}.Release|x86.ActiveCfg = Release|x86 - {974276EC-8F64-457B-A295-608869DEABA3}.Release|x86.Build.0 = Release|x86 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|x64.ActiveCfg = Debug|x64 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|x64.Build.0 = Debug|x64 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|x86.ActiveCfg = Debug|x86 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Debug|x86.Build.0 = Debug|x86 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|Any CPU.Build.0 = Release|Any CPU - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|x64.ActiveCfg = Release|x64 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|x64.Build.0 = Release|x64 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|x86.ActiveCfg = Release|x86 - {B5765C54-1D4B-47C1-8779-F14323AF1EFB}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/adminweb/DotNetLive.AdminWeb/Controllers/AccountController.cs b/src/adminweb/DotNetLive.AdminWeb/Controllers/AccountController.cs index cc0765a..653576b 100644 --- a/src/adminweb/DotNetLive.AdminWeb/Controllers/AccountController.cs +++ b/src/adminweb/DotNetLive.AdminWeb/Controllers/AccountController.cs @@ -1,5 +1,6 @@ -using DotNetLive.Framework.UserIdentity; -using DotNetLive.Framework.WebFramework.Controllers; +using DotNetLive.Framework.Models; +using DotNetLive.Framework.Mvc.UserIdentity; +using DotNetLive.Framework.Mvc.WebFramework.Controllers; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs b/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs index 41e9704..8dfc849 100644 --- a/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs +++ b/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs @@ -3,7 +3,6 @@ using DotNetLive.Framework.Data.Repositories; using DotNetLive.Framework.DependencyManagement; using DotNetLive.Framework.Models; -using DotNetLive.Framework.UserIdentity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; @@ -15,6 +14,8 @@ namespace DotNetLive.AdminWeb.DependencyRegister { public class ServiceDependencyRegister : IDependencyRegister { + public ExecuteOrderType ExecuteOrder => ExecuteOrderType.Normal; + public void Register(IServiceCollection services, IConfigurationRoot configuration, IServiceProvider serviceProvider) { services.AddSingleton(); diff --git a/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj b/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj index d227d53..4719f0f 100644 --- a/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj +++ b/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj @@ -13,6 +13,9 @@ + + + @@ -24,8 +27,4 @@ - - - - \ No newline at end of file diff --git a/src/adminweb/DotNetLive.AdminWeb/Views/Shared/_LoginPartial.cshtml b/src/adminweb/DotNetLive.AdminWeb/Views/Shared/_LoginPartial.cshtml index 405a832..4d83f51 100644 --- a/src/adminweb/DotNetLive.AdminWeb/Views/Shared/_LoginPartial.cshtml +++ b/src/adminweb/DotNetLive.AdminWeb/Views/Shared/_LoginPartial.cshtml @@ -1,4 +1,5 @@ @using Microsoft.AspNetCore.Identity +@using DotNetLive.Framework.Web.Models @inject SignInManager SignInManager @inject UserManager UserManager From 29b82915075fa9e365990604377dd9c35f0f4c04 Mon Sep 17 00:00:00 2001 From: Fanyuepan Date: Mon, 13 Mar 2017 17:59:13 +0800 Subject: [PATCH 2/2] remove DotNetLive.Framework.Data --- .../DependencyRegister/ServiceDependencyRegister.cs | 2 -- src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj | 1 - 2 files changed, 3 deletions(-) diff --git a/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs b/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs index 8dfc849..ab93008 100644 --- a/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs +++ b/src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs @@ -1,6 +1,4 @@ using DotNetLive.AdminWeb.Models.TodoModels; -using DotNetLive.Framework.Data; -using DotNetLive.Framework.Data.Repositories; using DotNetLive.Framework.DependencyManagement; using DotNetLive.Framework.Models; using Microsoft.AspNetCore.Http; diff --git a/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj b/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj index 4719f0f..1a75473 100644 --- a/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj +++ b/src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj @@ -14,7 +14,6 @@ -