move ContosoUniversity.Data.Interfaces => ContosoUniversity.Common.In…

…terfaces
ravi-shiva · Oct 25, 2017 · abd4d54 · abd4d54
1 parent 86053bc
commit abd4d54
Show file tree

Hide file tree

Showing 31 changed files with 38 additions and 123 deletions.
diff --git a/ContosoUniversity.Api.Tests/DepartmentsControllerTests.cs b/ContosoUniversity.Api.Tests/DepartmentsControllerTests.cs
@@ -1,13 +1,13 @@
 using Xunit;
 using ContosoUniversity.Api.Controllers;
 using Moq;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.Data.Entities;
 using System.Collections.Generic;
 using System;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ContosoUniversity.Tests;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Api.Tests
 {

diff --git a/ContosoUniversity.Api/Controllers/DepartmentsController.cs b/ContosoUniversity.Api/Controllers/DepartmentsController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using ContosoUniversity.Data.Entities;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/ContosoUniversity.Api/Startup.cs b/ContosoUniversity.Api/Startup.cs
@@ -2,11 +2,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using ContosoUniversity.Data.Interfaces;
 using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Rewrite;
 using ContosoUniversity.Common;
 using ContosoUniversity.Common.Data;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Api
 {

diff --git a/ContosoUniversity.Common/Data/ApiInitializer.cs b/ContosoUniversity.Common/Data/ApiInitializer.cs
@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Hosting;
 using ContosoUniversity.Data;

diff --git a/ContosoUniversity.Data/SampleData.cs → ContosoUniversity.Common/Data/SampleData.cs b/ContosoUniversity.Data/SampleData.cs → ContosoUniversity.Common/Data/SampleData.cs
@@ -1,7 +1,7 @@
 using ContosoUniversity.Data.DTO;
 using System.Collections.Generic;
 
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Common.Data
 {
  public class SampleData
  {

diff --git a/ContosoUniversity.Data/SeedData.cs → ContosoUniversity.Common/Data/SeedData.cs b/ContosoUniversity.Data/SeedData.cs → ContosoUniversity.Common/Data/SeedData.cs
@@ -2,7 +2,7 @@
 using ContosoUniversity.Data.Entities;
 using System.Linq;
 
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Common.Data
 {
  public class SeedData
  {

diff --git a/ContosoUniversity.Common/Data/WebInitializer.cs b/ContosoUniversity.Common/Data/WebInitializer.cs
@@ -4,7 +4,7 @@
 using ContosoUniversity.Data.DbContexts;
 using Microsoft.AspNetCore.Identity;
 using System.Threading.Tasks;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using Microsoft.Extensions.Options;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.AspNetCore.Hosting;

diff --git a/...versity.Data/Interfaces/IDbInitializer.cs → ...rsity.Common/Interfaces/IDbInitializer.cs b/...versity.Data/Interfaces/IDbInitializer.cs → ...rsity.Common/Interfaces/IDbInitializer.cs
@@ -1,4 +1,4 @@
-namespace ContosoUniversity.Data.Interfaces
+namespace ContosoUniversity.Common.Interfaces
 {
  public interface IDbInitializer
  {

diff --git a/...sity.Data/Interfaces/IPersonRepository.cs → ...ty.Common/Interfaces/IPersonRepository.cs b/...sity.Data/Interfaces/IPersonRepository.cs → ...ty.Common/Interfaces/IPersonRepository.cs
@@ -1,7 +1,7 @@
 using ContosoUniversity.Data.Entities;
 using System.Linq;
 
-namespace ContosoUniversity.Data.Interfaces
+namespace ContosoUniversity.Common.Interfaces
 {
  public interface IPersonRepository<T> : IRepository<T> where T : Person
  {

diff --git a/...University.Data/Interfaces/IRepository.cs → ...iversity.Common/Interfaces/IRepository.cs b/...University.Data/Interfaces/IRepository.cs → ...iversity.Common/Interfaces/IRepository.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ContosoUniversity.Data.Interfaces
+namespace ContosoUniversity.Common.Interfaces
 {
  public interface IRepository<T> where T : BaseEntity
  {

diff --git a/ContosoUniversity.Data/IUnitOfWork.cs → ...iversity.Common/Interfaces/IUnitOfWork.cs b/ContosoUniversity.Data/IUnitOfWork.cs → ...iversity.Common/Interfaces/IUnitOfWork.cs
@@ -1,4 +1,4 @@
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Common.Interfaces
 {
  public interface IUnitOfWork
  {

diff --git a/...ity.Data/Repositories/PersonRepository.cs → ...y.Common/Repositories/PersonRepository.cs b/...ity.Data/Repositories/PersonRepository.cs → ...y.Common/Repositories/PersonRepository.cs
@@ -1,9 +1,10 @@
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using System;
 using System.Linq;
+using ContosoUniversity.Data;
 
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Common.Repositories
 {
  public class PersonRepository<T> : Repository<T>, IPersonRepository<T> where T : Person
  {

diff --git a/...niversity.Data/Repositories/Repository.cs → ...versity.Common/Repositories/Repository.cs b/...niversity.Data/Repositories/Repository.cs → ...versity.Common/Repositories/Repository.cs
@@ -1,5 +1,5 @@
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;

diff --git a/ContosoUniversity.Common/ServiceCollectionExtensions.cs b/ContosoUniversity.Common/ServiceCollectionExtensions.cs
@@ -1,14 +1,15 @@
 using ContosoUniversity.Data;
 using ContosoUniversity.Data.DbContexts;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using ContosoUniversity.Common.Data;
 
 namespace ContosoUniversity.Common
 {

diff --git a/ContosoUniversity.Data/UnitOfWork.cs → ContosoUniversity.Common/UnitOfWork.cs b/ContosoUniversity.Data/UnitOfWork.cs → ContosoUniversity.Common/UnitOfWork.cs
@@ -1,7 +1,9 @@
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
+using ContosoUniversity.Data;
+using ContosoUniversity.Common.Repositories;
 
-namespace ContosoUniversity.Data
+namespace ContosoUniversity.Common
 {
  // use c# 7 expression-bodied members
  public class UnitOfWork : IUnitOfWork

diff --git a/ContosoUniversity.Data.Tests/ContosoUniversity.Data.Tests.csproj b/ContosoUniversity.Data.Tests/ContosoUniversity.Data.Tests.csproj
@@ -13,6 +13,7 @@
  </ItemGroup>
 
  <ItemGroup>
+ <ProjectReference Include="..\ContosoUniversity.Common\ContosoUniversity.Common.csproj" />
  <ProjectReference Include="..\ContosoUniversity.Data\ContosoUniversity.Data.csproj" />
  </ItemGroup>
 

diff --git a/ContosoUniversity.Data.Tests/UnitOfWorkTests.cs b/ContosoUniversity.Data.Tests/UnitOfWorkTests.cs
@@ -1,5 +1,6 @@
+using ContosoUniversity.Common;
+using ContosoUniversity.Common.Repositories;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Threading.Tasks;

diff --git a/ContosoUniversity.Data/DbInitializer.cs b/ContosoUniversity.Data/DbInitializer.cs
diff --git a/ContosoUniversity.Test/ContosoUniversity.Test.csproj b/ContosoUniversity.Test/ContosoUniversity.Test.csproj
@@ -14,6 +14,7 @@
  </ItemGroup>
 
  <ItemGroup>
+ <ProjectReference Include="..\ContosoUniversity.Common\ContosoUniversity.Common.csproj" />
  <ProjectReference Include="..\ContosoUniversity.Data\ContosoUniversity.Data.csproj" />
  </ItemGroup>
 

diff --git a/ContosoUniversity.Test/MockingHelper.cs b/ContosoUniversity.Test/MockingHelper.cs
@@ -1,5 +1,5 @@
-using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
+using ContosoUniversity.Common.Interfaces;
+using ContosoUniversity.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 using System.Collections.Generic;

diff --git a/ContosoUniversity.Web.Tests/Controllers/CoursesControllerTests.cs b/ContosoUniversity.Web.Tests/Controllers/CoursesControllerTests.cs
@@ -1,6 +1,5 @@
 using ContosoUniversity.Web.Controllers;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.Tests;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -12,6 +11,7 @@
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Tests.Controllers
 {

diff --git a/ContosoUniversity.Web.Tests/Controllers/DepartmentsControllerTests.cs b/ContosoUniversity.Web.Tests/Controllers/DepartmentsControllerTests.cs
@@ -1,6 +1,5 @@
 using ContosoUniversity.Web.Controllers;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
@@ -12,6 +11,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using ContosoUniversity.Tests;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Tests.Controllers
 {

diff --git a/ContosoUniversity.Web.Tests/Controllers/HomeControllerTests.cs b/ContosoUniversity.Web.Tests/Controllers/HomeControllerTests.cs
@@ -1,13 +1,13 @@
 using ContosoUniversity.Web.Controllers;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using System;
 using System.Collections.Generic;
 using Xunit;
 using Xunit.Abstractions;
 using ContosoUniversity.Tests;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Tests.Controllers
 {

diff --git a/ContosoUniversity.Web.Tests/Controllers/InstructorsControllerTests.cs b/ContosoUniversity.Web.Tests/Controllers/InstructorsControllerTests.cs
@@ -1,7 +1,6 @@
 using ContosoUniversity.Web.Controllers;
 using ContosoUniversity.Data.Entities;
 using ContosoUniversity.Data.Enums;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.Models.SchoolViewModels;
 using ContosoUniversity.Tests;
 using Microsoft.AspNetCore.Mvc;
@@ -14,6 +13,7 @@
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Tests.Controllers
 {

diff --git a/ContosoUniversity.Web.Tests/Controllers/StudentsControllerTests.cs b/ContosoUniversity.Web.Tests/Controllers/StudentsControllerTests.cs
@@ -1,6 +1,5 @@
 using ContosoUniversity.Web.Controllers;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.Tests;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -11,6 +10,7 @@
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Tests.Controllers
 {

diff --git a/ContosoUniversity.Web/Controllers/CoursesController.cs b/ContosoUniversity.Web/Controllers/CoursesController.cs
@@ -3,11 +3,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
-using ContosoUniversity.Data;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using System;
-using ContosoUniversity.Web;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Controllers
 {

diff --git a/ContosoUniversity.Web/Controllers/DepartmentsController.cs b/ContosoUniversity.Web/Controllers/DepartmentsController.cs
@@ -4,11 +4,10 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
 using System;
-using ContosoUniversity.Web;
 using ContosoUniversity.ViewModels;
 using System.Collections.Generic;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Controllers
 {

diff --git a/ContosoUniversity.Web/Controllers/HomeController.cs b/ContosoUniversity.Web/Controllers/HomeController.cs
@@ -1,12 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using ContosoUniversity.Models.SchoolViewModels;
-using ContosoUniversity.Data;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Data.Common;
-using ContosoUniversity.Data.Interfaces;
 using ContosoUniversity.Data.Entities;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Controllers
 {

diff --git a/ContosoUniversity.Web/Controllers/InstructorsController.cs b/ContosoUniversity.Web/Controllers/InstructorsController.cs
@@ -4,11 +4,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using ContosoUniversity.Data;
 using ContosoUniversity.Models.SchoolViewModels;
 using ContosoUniversity.Data.Entities;
-using ContosoUniversity.Data.Interfaces;
-using ContosoUniversity.Web;
+using ContosoUniversity.Common.Interfaces;
 
 namespace ContosoUniversity.Web.Controllers
 {