Skip to content

Commit d8e5bab

Browse files
authored
Merge pull request arch#106 from kevingy/master
Issue arch#105: Update solution structure and namespaces
2 parents 0286495 + bcbca93 commit d8e5bab

31 files changed

+108
-92
lines changed

src/Host/Controllers/ValuesController.cs renamed to UnitOfWork.Host/Controllers/ValuesController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using System.Collections.Generic;
22
using System.Linq;
33
using System.Threading.Tasks;
4-
using Host.Models;
54
using Microsoft.AspNetCore.Mvc;
5+
using Arch.EntityFrameworkCore.UnitOfWork.Collections;
6+
using Arch.EntityFrameworkCore.UnitOfWork.Host.Models;
67
using Microsoft.EntityFrameworkCore;
78
using Microsoft.Extensions.Logging;
89

9-
namespace Host.Controllers
10+
namespace Arch.EntityFrameworkCore.UnitOfWork.Host.Controllers
1011
{
1112
[Route("api/[controller]")]
1213
public class ValuesController : Controller

src/Host/Models/BlogggingContext.cs renamed to UnitOfWork.Host/Models/BlogggingContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using Microsoft.EntityFrameworkCore;
33

4-
namespace Host.Models
4+
namespace Arch.EntityFrameworkCore.UnitOfWork.Host.Models
55
{
66
public class BloggingContext : DbContext
77
{

src/Host/Models/CustomBlogRepository.cs renamed to UnitOfWork.Host/Models/CustomBlogRepository.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Microsoft.EntityFrameworkCore;
2-
3-
namespace Host.Models
1+
namespace Arch.EntityFrameworkCore.UnitOfWork.Host.Models
42
{
53
public class CustomBlogRepository : Repository<Blog>, IRepository<Blog>
64
{

src/Host/Program.cs renamed to UnitOfWork.Host/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.AspNetCore.Hosting;
77
using Microsoft.AspNetCore.Builder;
88

9-
namespace Host
9+
namespace Arch.EntityFrameworkCore.UnitOfWork.Host
1010
{
1111
public class Program
1212
{

src/Host/Startup.cs renamed to UnitOfWork.Host/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using Host.Models;
2-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore.Builder;
32
using Microsoft.AspNetCore.Hosting;
3+
using Arch.EntityFrameworkCore.UnitOfWork.Host.Models;
44
using Microsoft.EntityFrameworkCore;
55
using Microsoft.Extensions.Configuration;
66
using Microsoft.Extensions.DependencyInjection;
77
using Microsoft.Extensions.Logging;
88

9-
namespace Host
9+
namespace Arch.EntityFrameworkCore.UnitOfWork.Host
1010
{
1111
public class Startup
1212
{

src/Host/Host.csproj renamed to UnitOfWork.Host/UnitOfWork.Host.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
9-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
11-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
15-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.2" />
19-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
20-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.4" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.4" />
19+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
20+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ProjectReference Include="..\Microsoft.EntityFrameworkCore.UnitOfWork\Microsoft.EntityFrameworkCore.UnitOfWork.csproj" />
23+
<ProjectReference Include="..\UnitOfWork\UnitOfWork.csproj" />
2424
</ItemGroup>
2525
</Project>
File renamed without changes.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
43
<!--
54
Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
65
-->
7-
86
<system.webServer>
97
<handlers>
10-
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
8+
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
119
</handlers>
12-
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
10+
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false">
11+
<environmentVariables />
12+
</aspNetCore>
1313
</system.webServer>
14-
</configuration>
14+
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using System.ComponentModel.DataAnnotations.Schema;
33

4-
namespace Microsoft.EntityFrameworkCore.UnitOfWork.Tests.Entities
4+
namespace Arch.EntityFrameworkCore.UnitOfWork.Tests.Entities
55
{
66
public class City
77
{

0 commit comments

Comments
 (0)