Skip to content

remove framework source and use nuget #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

remove framework source and use nuget #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0ade47
remove framework source and use nuget
fanpan26 Mar 13, 2017
29b8291
remove DotNetLive.Framework.Data
fanpan26 Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions src/adminweb/DotNetLive.AdminWeb.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/adminweb/DotNetLive.AdminWeb/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
5 changes: 2 additions & 3 deletions src/adminweb/DotNetLive.AdminWeb/DependencyRegister/ServiceDependencyRegister.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using DotNetLive.AdminWeb.Models.TodoModels;
using DotNetLive.Framework.Data;
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;
Expand All @@ -15,6 +12,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<ITodoRepository, TodoRepository>();
Expand Down
6 changes: 2 additions & 4 deletions src/adminweb/DotNetLive.AdminWeb/DotNetLive.AdminWeb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<None Remove="ApiControllers\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNetLive.Framework" Version="1.0.0" />
<PackageReference Include="DotNetLive.Framework.Mvc" Version="1.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
Expand All @@ -24,8 +26,4 @@
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\dotnetlive.framework\src\DotNetLive.Framework.WebApiClient\DotNetLive.Framework.WebApiClient.csproj" />
<ProjectReference Include="..\..\..\..\dotnetlive.framework\src\DotNetLive.Framework\DotNetLive.Framework.csproj" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/adminweb/DotNetLive.AdminWeb/Views/Shared/_LoginPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Identity
@using DotNetLive.Framework.Web.Models

@inject SignInManager<ApplicationUser> SignInManager
@inject UserManager<ApplicationUser> UserManager
Expand Down