diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk/AbpDeskApplicationModule.cs b/src/AbpDesk/AbpDesk.Application/AbpDesk/AbpDeskApplicationModule.cs new file mode 100644 index 0000000000..57091e9966 --- /dev/null +++ b/src/AbpDesk/AbpDesk.Application/AbpDesk/AbpDeskApplicationModule.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace AbpDesk +{ + [DependsOn(typeof(AbpDeskDomainModule))] + public class AbpDeskApplicationModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj index e17fd233e4..fadb40151e 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj @@ -4,18 +4,17 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 1a1575d7-e57e-4a40-8113-fd01bb1753d5 - AbpDesk.ConsoleDemo + + .\obj .\bin\ v4.6.1 - 2.0 - + \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs new file mode 100644 index 0000000000..757c32070b --- /dev/null +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs @@ -0,0 +1,15 @@ +using AbpDesk.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace AbpDesk.ConsoleDemo +{ + [DependsOn(typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule))] + public class AbpDeskConsoleDemoModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs new file mode 100644 index 0000000000..9c97479cf6 --- /dev/null +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/Program.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; + +namespace AbpDesk.ConsoleDemo +{ + public class Program + { + public static void Main(string[] args) + { + var services = new ServiceCollection(); + using (var application = AbpApplication.Create(services)) + { + application.Initialize(services.BuildServiceProvider()); + + application + .ServiceProvider + .GetRequiredService() + .List(); + + Console.ReadLine(); + } + } + } +} diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs new file mode 100644 index 0000000000..f2c7a5ccff --- /dev/null +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs @@ -0,0 +1,26 @@ +using System; +using AbpDesk.Tickets; +using Volo.DependencyInjection; + +namespace AbpDesk.ConsoleDemo +{ + public class TicketLister : ITransientDependency + { + private readonly ITicketAppService _ticketAppService; + + public TicketLister(ITicketAppService ticketAppService) + { + _ticketAppService = ticketAppService; + } + + public void List() + { + var result = _ticketAppService.GetAll(); + + foreach (var ticket in result.Items) + { + Console.WriteLine(ticket); + } + } + } +} \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/Program.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/Program.cs deleted file mode 100644 index be1d9460b1..0000000000 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace AbpDesk.ConsoleDemo -{ - public class Program - { - public static void Main(string[] args) - { - - Console.ReadLine(); - } - } -} diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/project.json b/src/AbpDesk/AbpDesk.ConsoleDemo/project.json index dff934e8b4..2ec4f0ba24 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/project.json +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/project.json @@ -5,6 +5,9 @@ }, "dependencies": { + "AbpDesk.Application": "1.0.0-*", + "AbpDesk.Application.Contracts": "1.0.0-*", + "AbpDesk.EntityFrameworkCore": "1.0.0-*", "Microsoft.NETCore.App": { "type": "platform", "version": "1.1.0" diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs new file mode 100644 index 0000000000..e02eb299c8 --- /dev/null +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace AbpDesk +{ + public class AbpDeskDomainModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDomainModule.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDomainModule.cs new file mode 100644 index 0000000000..d92e47f4c9 --- /dev/null +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDomainModule.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace AbpDesk.EntityFrameworkCore +{ + [DependsOn(typeof(AbpDeskDomainModule))] + public class AbpDeskEntityFrameworkCoreModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs index 1d928aa41e..6f26fec97b 100644 --- a/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs +++ b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs @@ -27,5 +27,10 @@ namespace Volo.Abp.Application.Services.Dtos { Id = id; } + + public override string ToString() + { + return $"[{GetType().Name}] Id = {Id}"; + } } } \ No newline at end of file