Skip to content

Commit c9d87c8

Browse files
hikalkanhikalkan
committed
Merge remote-tracking branch 'refs/remotes/origin/dev'
2 parents f381496 + 2329521 commit c9d87c8

File tree

1,423 files changed

+203837
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,423 files changed

+203837
-572
lines changed

‎AbpCompanyName.AbpProjectName.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F10AA149-2
2222
EndProject
2323
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Tests", "test\AbpCompanyName.AbpProjectName.Tests\AbpCompanyName.AbpProjectName.Tests.xproj", "{0D4C5D00-C144-4213-A007-4B8944113AB1}"
2424
EndProject
25+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Web.Tests", "test\AbpCompanyName.AbpProjectName.Web.Tests\AbpCompanyName.AbpProjectName.Web.Tests.xproj", "{5D441612-29CA-4DAD-9945-B9DE11CE026C}"
26+
EndProject
2527
Global
2628
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2729
Debug|Any CPU = Debug|Any CPU
@@ -48,6 +50,10 @@ Global
4850
{0D4C5D00-C144-4213-A007-4B8944113AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
4951
{0D4C5D00-C144-4213-A007-4B8944113AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
5052
{0D4C5D00-C144-4213-A007-4B8944113AB1}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{5D441612-29CA-4DAD-9945-B9DE11CE026C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{5D441612-29CA-4DAD-9945-B9DE11CE026C}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{5D441612-29CA-4DAD-9945-B9DE11CE026C}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{5D441612-29CA-4DAD-9945-B9DE11CE026C}.Release|Any CPU.Build.0 = Release|Any CPU
5157
EndGlobalSection
5258
GlobalSection(SolutionProperties) = preSolution
5359
HideSolutionNode = FALSE
@@ -58,5 +64,6 @@ Global
5864
{3870C648-4AEA-4B85-BA3F-F2F63B96136A} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
5965
{DC780BC4-4EAC-4C63-9052-6F3169A59FA4} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
6066
{0D4C5D00-C144-4213-A007-4B8944113AB1} = {F10AA149-2626-486E-85BB-9CD5365F3016}
67+
{5D441612-29CA-4DAD-9945-B9DE11CE026C} = {F10AA149-2626-486E-85BB-9CD5365F3016}
6168
EndGlobalSection
6269
EndGlobal

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ using ASP.NET Core and EntityFramework Core.
55

66
## Prerequirements
77

8-
* Visual Studio 2015
9-
* ASP.NET Core RC2 (Download here: https://go.microsoft.com/fwlink/?LinkId=798481)
8+
* Visual Studio 2015 (Install Update3 if not installed: https://www.visualstudio.com/news/releasenotes/vs2015-update3-vs)
9+
* ASP.NET Core (Install here: https://go.microsoft.com/fwlink/?LinkId=817245)
1010
* SQL Server
1111

1212
## How To Run
1313

1414
* Open solution in Visual Studio 2015
15-
* Set .Web project as Startup Project
15+
* Set .Web project as Startup Project and build the project.
1616
* Run database migrations
1717
* Open command line
1818
* Locate to the folder contains .EntityFrameworkCore project

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-preview1-002702"
4+
"version": "1.0.0-preview2-003121"
55
}
66
}

‎src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Abp.Application.Services;
2-
using Abp.ObjectMapping;
32

43
namespace AbpCompanyName.AbpProjectName
54
{
@@ -8,15 +7,8 @@ namespace AbpCompanyName.AbpProjectName
87
/// </summary>
98
public abstract class AbpProjectNameAppServiceBase : ApplicationService
109
{
11-
/// <summary>
12-
/// Reference to the object to object mapper.
13-
/// TODO: REMOVE THIS WHEN IT'S ADDED TO ApplicationService in Abp.
14-
/// </summary>
15-
public IObjectMapper ObjectMapper { get; set; }
16-
1710
protected AbpProjectNameAppServiceBase()
1811
{
19-
ObjectMapper = NullObjectMapper.Instance;
2012
LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;
2113
}
2214
}

‎src/AbpCompanyName.AbpProjectName.Application/Products/Dtos/ProductDto.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/AbpCompanyName.AbpProjectName.Application/Products/IProductAppService.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/AbpCompanyName.AbpProjectName.Application/Products/ProductAppService.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/AbpCompanyName.AbpProjectName.Application/project.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
{
1+
{
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp.AutoMapper": "0.9.4",
6-
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*"
5+
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
6+
"Abp.EntityFrameworkCore": "0.10.3",
7+
"Abp.AutoMapper": "0.10.3"
78
},
89

910
"frameworks": {

‎src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
public class AbpProjectNameConsts
44
{
55
public const string LocalizationSourceName = "AbpProjectName";
6+
7+
public const string ConnectionStringName = "Default";
68
}
79
}

‎src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System.Reflection;
2-
using Abp.Localization;
3-
using Abp.Localization.Dictionaries;
4-
using Abp.Localization.Dictionaries.Json;
52
using Abp.Modules;
3+
using AbpCompanyName.AbpProjectName.Localization;
64

75
namespace AbpCompanyName.AbpProjectName
86
{
@@ -12,17 +10,7 @@ public override void PreInitialize()
1210
{
1311
Configuration.Auditing.IsEnabledForAnonymousUsers = true;
1412

15-
Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", isDefault: true));
16-
Configuration.Localization.Languages.Add(new LanguageInfo("tr", "Türkçe"));
17-
18-
Configuration.Localization.Sources.Add(
19-
new DictionaryBasedLocalizationSource(AbpProjectNameConsts.LocalizationSourceName,
20-
new JsonEmbeddedFileLocalizationDictionaryProvider(
21-
Assembly.GetExecutingAssembly(),
22-
"AbpCompanyName.AbpProjectName.Core.Localization.SourceFiles"
23-
)
24-
)
25-
);
13+
AbpProjectNameLocalizationConfigurer.Configure(Configuration.Localization);
2614
}
2715

2816
public override void Initialize()

0 commit comments

Comments
 (0)