diff options
| author | transtrike <transtrike@gmail.com> | 2021-02-13 17:57:54 +0200 |
|---|---|---|
| committer | transtrike <transtrike@gmail.com> | 2021-02-13 17:57:54 +0200 |
| commit | c5b27c7eb62cc5428a0c01ffcf381f429d776122 (patch) | |
| tree | f4a2e12df9771166ab96dd08ac33620773aee5ba | |
| parent | 98e17766b203734a1817eed94338e2d25f4395f7 (diff) | |
| download | DevHive-c5b27c7eb62cc5428a0c01ffcf381f429d776122.tar DevHive-c5b27c7eb62cc5428a0c01ffcf381f429d776122.tar.gz DevHive-c5b27c7eb62cc5428a0c01ffcf381f429d776122.zip | |
Removed all references
| -rw-r--r-- | src/Data/DevHive.Data.Models/Comment.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj | 6 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IComment.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IComment.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IModel.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IModel.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IPost.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IPost.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IRating.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IRating.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IRole.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IRole.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Interfaces/IUser.cs (renamed from src/Data/DevHive.Data/Interfaces/Models/IUser.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Language.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Post.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/ProfilePicture.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Rating.cs | 4 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Role.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/Technology.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Models/User.cs | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj | 8 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/DevHive.Data.csproj | 8 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/ICommentRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IFeedRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IPostRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IRatingRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs) | 0 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IRoleRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs) | 2 | ||||
| -rw-r--r-- | src/Data/DevHive.Data/Interfaces/IUserRepository.cs (renamed from src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs) | 2 | ||||
| -rw-r--r-- | src/DevHive.sln | 304 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj | 4 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/FriendServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/LoginServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs) | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs) | 4 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Models/User/UserServiceModel.cs (renamed from src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs) | 4 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj | 8 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Tests/RoleService.Tests.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services.Tests/UserService.Tests.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/DevHive.Services.csproj | 6 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Interfaces/IRoleService.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Interfaces/IUserService.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Services/RoleService.cs | 2 | ||||
| -rw-r--r-- | src/Services/DevHive.Services/Services/UserService.cs | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj | 8 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs (renamed from src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs (renamed from src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/Role/RoleWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/LoginWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/RegisterWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/TokenWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs) | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs) | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/UserWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs) | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Models/User/UsernameWebModel.cs (renamed from src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs) | 2 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj | 7 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web.Tests/UserController.Tests.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web/Controllers/RoleController.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web/Controllers/UserController.cs | 4 | ||||
| -rw-r--r-- | src/Web/DevHive.Web/DevHive.Web.csproj | 7 |
76 files changed, 228 insertions, 292 deletions
diff --git a/src/Data/DevHive.Data.Models/Comment.cs b/src/Data/DevHive.Data.Models/Comment.cs index e2bb21d..10a3aaf 100644 --- a/src/Data/DevHive.Data.Models/Comment.cs +++ b/src/Data/DevHive.Data.Models/Comment.cs @@ -1,5 +1,5 @@ using System; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj index ebf5f9c..628e361 100644 --- a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj +++ b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj @@ -1,11 +1,5 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> <TargetFramework>net5.0</TargetFramework> </PropertyGroup> - - <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - </Project> diff --git a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs index 97c1578..c8f1f6a 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs @@ -1,7 +1,7 @@ using System; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IComment : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs index 9eed09d..06e11b4 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface ILanguage : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs index f903af3..3226dce 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs index 712d955..b1f0cb7 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using DevHive.Data.Models; using DevHive.Data.RelationModels; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IPost : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs index c3fcbea..550af24 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs @@ -1,7 +1,7 @@ using System; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IProfilePicture : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs index d1b968f..1b081b0 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IRating : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs index c8b7068..3a87e12 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IRole { diff --git a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs index 153f75f..575aea6 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface ITechnology : IModel { diff --git a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs index fcd741c..7606ba2 100644 --- a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs +++ b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using DevHive.Data.Models; using DevHive.Data.RelationModels; -namespace DevHive.Data.Interfaces.Models +namespace DevHive.Data.Models.Interfaces { public interface IUser : IModel { diff --git a/src/Data/DevHive.Data.Models/Language.cs b/src/Data/DevHive.Data.Models/Language.cs index 7ad8ff2..fdcfb07 100644 --- a/src/Data/DevHive.Data.Models/Language.cs +++ b/src/Data/DevHive.Data.Models/Language.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/Post.cs b/src/Data/DevHive.Data.Models/Post.cs index 3f3d8c9..5138d19 100644 --- a/src/Data/DevHive.Data.Models/Post.cs +++ b/src/Data/DevHive.Data.Models/Post.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using DevHive.Data.RelationModels; namespace DevHive.Data.Models diff --git a/src/Data/DevHive.Data.Models/ProfilePicture.cs b/src/Data/DevHive.Data.Models/ProfilePicture.cs index d5cc397..c5dec68 100644 --- a/src/Data/DevHive.Data.Models/ProfilePicture.cs +++ b/src/Data/DevHive.Data.Models/ProfilePicture.cs @@ -1,5 +1,5 @@ using System; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/Rating.cs b/src/Data/DevHive.Data.Models/Rating.cs index e1bedd2..13fdbce 100644 --- a/src/Data/DevHive.Data.Models/Rating.cs +++ b/src/Data/DevHive.Data.Models/Rating.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { @@ -11,7 +11,7 @@ namespace DevHive.Data.Models public Guid PostId { get; set; } public Post Post { get; set; } - + public int Rate { get; set; } } } diff --git a/src/Data/DevHive.Data.Models/Role.cs b/src/Data/DevHive.Data.Models/Role.cs index 259d867..0df556c 100644 --- a/src/Data/DevHive.Data.Models/Role.cs +++ b/src/Data/DevHive.Data.Models/Role.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using Microsoft.AspNetCore.Identity; using System; diff --git a/src/Data/DevHive.Data.Models/Technology.cs b/src/Data/DevHive.Data.Models/Technology.cs index 6f98f0b..9354d5b 100644 --- a/src/Data/DevHive.Data.Models/Technology.cs +++ b/src/Data/DevHive.Data.Models/Technology.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/User.cs b/src/Data/DevHive.Data.Models/User.cs index 983d073..806397a 100644 --- a/src/Data/DevHive.Data.Models/User.cs +++ b/src/Data/DevHive.Data.Models/User.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using DevHive.Data.RelationModels; using Microsoft.AspNetCore.Identity; diff --git a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj index 42a3273..d6d0876 100644 --- a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj +++ b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj @@ -14,14 +14,6 @@ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Data\DevHive.Data.csproj" /> - - <ProjectReference Include="..\DevHive.Data.Models\DevHive.Data.Models.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Data/DevHive.Data/DevHive.Data.csproj b/src/Data/DevHive.Data/DevHive.Data.csproj index 62b61dc..e8f38ee 100644 --- a/src/Data/DevHive.Data/DevHive.Data.csproj +++ b/src/Data/DevHive.Data/DevHive.Data.csproj @@ -18,14 +18,6 @@ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Data.Models\DevHive.Data.Models.csproj" /> - - <ProjectReference Include="..\DevHive.Data.Tests\DevHive.Data.Tests.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs index 267f251..f85849f 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface ICommentRepository : IRepository<Comment> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs index 7262510..bda51fa 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using DevHive.Data.Models; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface IFeedRepository { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs index db2949a..4771f91 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface ILanguageRepository : IRepository<Language> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs index 9f7cf85..c24d596 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface IPostRepository : IRepository<Post> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs index f77f301..b5aff88 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface IRatingRepository : IRepository<Rating> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs b/src/Data/DevHive.Data/Interfaces/IRepository.cs index 0d11cd3..0d11cd3 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IRepository.cs diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs index e834369..a1080bb 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface IRoleRepository : IRepository<Role> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs index 9126bfc..3e55b2d 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface ITechnologyRepository : IRepository<Technology> { diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs index 5ebe3d3..917809d 100644 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using DevHive.Data.Models; using DevHive.Data.Repositories.Interfaces; -namespace DevHive.Data.Interfaces.Repositories +namespace DevHive.Data.Interfaces { public interface IUserRepository : IRepository<User> { diff --git a/src/DevHive.sln b/src/DevHive.sln index 73c5b85..05bdcda 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -1,40 +1,35 @@ 
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2E5E3F99-7936-4F3B-974E-A98000D1564B}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{0C2AC7A9-AC68-4668-B88E-9370C596F498}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{2ED11F7C-A247-48F6-99ED-CD0AA89C6A28}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data", "Data\DevHive.Data\DevHive.Data.csproj", "{70D0903D-C65F-4600-B6F8-F7BD00500A51}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "Web\DevHive.Web\DevHive.Web.csproj", "{BD295280-3F69-4BDD-8715-526E9852930E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Models", "Data\DevHive.Data.Models\DevHive.Data.Models.csproj", "{56F85916-3955-4558-8809-376D20902B94}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{C94823A0-150D-49E0-9913-628FB5D67370}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "Data\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "Services\DevHive.Services\DevHive.Services.csproj", "{897281A2-C315-42DA-92CB-267DF91D8A4B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{F2864A9D-70F1-452F-AAAC-AAFD8102ABAD}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{9A0158E8-834E-4B8C-B62B-2BF6FF0E3518}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common.Models\DevHive.Common.csproj", "{5C3DFE9B-9690-475E-A0AE-D62315D38337}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data", "Data\DevHive.Data\DevHive.Data.csproj", "{A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7CA79114-C359-4871-BFA7-0EA898B50AE4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "Web\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{251A09C6-28CA-4E9E-B482-0B10ABE293FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "Services\DevHive.Services\DevHive.Services.csproj", "{B5F22590-E3CE-4595-BE48-AA7F1797A6B8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "Services\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{3E86ACCF-9F49-4D51-B152-4ACD6801211D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Models", "Services\DevHive.Services.Models\DevHive.Services.Models.csproj", "{2FFF985B-A26F-443D-A159-62ED2FD5A2BC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "Data\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{E6E401DC-43A0-4562-8584-4FA81FE0206C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "Services\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{6E58003B-E5E8-4AA4-8F70-A9442BBFC110}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Models", "Web\DevHive.Web.Models\DevHive.Web.Models.csproj", "{746A1043-A016-4CA6-953A-CECD02020E28}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{768A592D-58EA-4CD3-A053-2E8F2DC7708A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Models", "Services\DevHive.Services.Models\DevHive.Services.Models.csproj", "{2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "Web\DevHive.Web\DevHive.Web.csproj", "{A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Models", "Data\DevHive.Data.Models\DevHive.Data.Models.csproj", "{7FFECB5A-E23F-44E0-A978-416DBF075406}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Models", "Web\DevHive.Web.Models\DevHive.Web.Models.csproj", "{D8C898F7-A0DE-4939-8708-3D4A5C383EFC}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2C2D8ED7-CBBF-4E79-AC21-C932C6FA651B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common.Models\DevHive.Common.csproj", "{34E78E35-2476-4925-864A-467C2BC5042B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "Web\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{608273FF-01ED-48B3-B912-66CCDBF5572E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,144 +40,141 @@ Global Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x64.Build.0 = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x86.Build.0 = Debug|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|Any CPU.Build.0 = Release|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x64.ActiveCfg = Release|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x64.Build.0 = Release|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x86.ActiveCfg = Release|Any CPU
- {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x86.Build.0 = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x64.Build.0 = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x86.Build.0 = Debug|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|Any CPU.Build.0 = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x64.ActiveCfg = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x64.Build.0 = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x86.ActiveCfg = Release|Any CPU
- {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x86.Build.0 = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x64.Build.0 = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x86.Build.0 = Debug|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|Any CPU.Build.0 = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x64.ActiveCfg = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x64.Build.0 = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x86.ActiveCfg = Release|Any CPU
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x86.Build.0 = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x64.Build.0 = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x86.Build.0 = Debug|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|Any CPU.Build.0 = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x64.ActiveCfg = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x64.Build.0 = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x86.ActiveCfg = Release|Any CPU
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x86.Build.0 = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x64.Build.0 = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x86.Build.0 = Debug|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|Any CPU.Build.0 = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x64.ActiveCfg = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x64.Build.0 = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x86.ActiveCfg = Release|Any CPU
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x86.Build.0 = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x64.Build.0 = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x86.Build.0 = Debug|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x64.ActiveCfg = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x64.Build.0 = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x86.ActiveCfg = Release|Any CPU
- {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x86.Build.0 = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x64.ActiveCfg = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x64.Build.0 = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x86.ActiveCfg = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x86.Build.0 = Debug|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|Any CPU.Build.0 = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x64.ActiveCfg = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x64.Build.0 = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x86.ActiveCfg = Release|Any CPU
- {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x86.Build.0 = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x64.ActiveCfg = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x64.Build.0 = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x86.Build.0 = Debug|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|Any CPU.Build.0 = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x64.ActiveCfg = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x64.Build.0 = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x86.ActiveCfg = Release|Any CPU
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x86.Build.0 = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x64.ActiveCfg = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x64.Build.0 = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x86.Build.0 = Debug|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|Any CPU.Build.0 = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x64.ActiveCfg = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x64.Build.0 = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x86.ActiveCfg = Release|Any CPU
- {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x86.Build.0 = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x64.Build.0 = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x86.Build.0 = Debug|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|Any CPU.Build.0 = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x64.ActiveCfg = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x64.Build.0 = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x86.ActiveCfg = Release|Any CPU
- {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {BD295280-3F69-4BDD-8715-526E9852930E} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28}
- {897281A2-C315-42DA-92CB-267DF91D8A4B} = {C94823A0-150D-49E0-9913-628FB5D67370}
- {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518}
- {251A09C6-28CA-4E9E-B482-0B10ABE293FF} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28}
- {3E86ACCF-9F49-4D51-B152-4ACD6801211D} = {C94823A0-150D-49E0-9913-628FB5D67370}
- {E6E401DC-43A0-4562-8584-4FA81FE0206C} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518}
- {746A1043-A016-4CA6-953A-CECD02020E28} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28}
- {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17} = {C94823A0-150D-49E0-9913-628FB5D67370}
- {7FFECB5A-E23F-44E0-A978-416DBF075406} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518}
- {34E78E35-2476-4925-864A-467C2BC5042B} = {2C2D8ED7-CBBF-4E79-AC21-C932C6FA651B}
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x64.Build.0 = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x86.Build.0 = Debug|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|Any CPU.Build.0 = Release|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x64.ActiveCfg = Release|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x64.Build.0 = Release|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x86.ActiveCfg = Release|Any CPU
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x86.Build.0 = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|x64.Build.0 = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Debug|x86.Build.0 = Debug|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|Any CPU.Build.0 = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|x64.ActiveCfg = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|x64.Build.0 = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|x86.ActiveCfg = Release|Any CPU
+ {56F85916-3955-4558-8809-376D20902B94}.Release|x86.Build.0 = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x64.Build.0 = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x86.Build.0 = Debug|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x64.ActiveCfg = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x64.Build.0 = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.ActiveCfg = Release|Any CPU
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.Build.0 = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.Build.0 = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.Build.0 = Debug|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.ActiveCfg = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.Build.0 = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.ActiveCfg = Release|Any CPU
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.Build.0 = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x64.Build.0 = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x86.Build.0 = Debug|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x64.ActiveCfg = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x64.Build.0 = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x86.ActiveCfg = Release|Any CPU
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x86.Build.0 = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x64.Build.0 = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x86.Build.0 = Debug|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x64.ActiveCfg = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x64.Build.0 = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x86.ActiveCfg = Release|Any CPU
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x86.Build.0 = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x64.Build.0 = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x86.Build.0 = Debug|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x64.ActiveCfg = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x64.Build.0 = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x86.ActiveCfg = Release|Any CPU
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x86.Build.0 = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x64.Build.0 = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x86.Build.0 = Debug|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x64.ActiveCfg = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x64.Build.0 = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x86.ActiveCfg = Release|Any CPU
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x86.Build.0 = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x64.Build.0 = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x86.Build.0 = Debug|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x64.ActiveCfg = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x64.Build.0 = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x86.ActiveCfg = Release|Any CPU
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x86.Build.0 = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x64.Build.0 = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x86.Build.0 = Debug|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x64.ActiveCfg = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x64.Build.0 = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.ActiveCfg = Release|Any CPU
+ {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {0F5395E8-26FB-40FD-83A1-EE7766C5E398}
+ GlobalSection(NestedProjects) = preSolution
+ {70D0903D-C65F-4600-B6F8-F7BD00500A51} = {0C2AC7A9-AC68-4668-B88E-9370C596F498}
+ {56F85916-3955-4558-8809-376D20902B94} = {0C2AC7A9-AC68-4668-B88E-9370C596F498}
+ {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0} = {0C2AC7A9-AC68-4668-B88E-9370C596F498}
+ {5C3DFE9B-9690-475E-A0AE-D62315D38337} = {F2864A9D-70F1-452F-AAAC-AAFD8102ABAD}
+ {B5F22590-E3CE-4595-BE48-AA7F1797A6B8} = {7CA79114-C359-4871-BFA7-0EA898B50AE4}
+ {2FFF985B-A26F-443D-A159-62ED2FD5A2BC} = {7CA79114-C359-4871-BFA7-0EA898B50AE4}
+ {6E58003B-E5E8-4AA4-8F70-A9442BBFC110} = {7CA79114-C359-4871-BFA7-0EA898B50AE4}
+ {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A}
+ {D8C898F7-A0DE-4939-8708-3D4A5C383EFC} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A}
+ {608273FF-01ED-48B3-B912-66CCDBF5572E} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A}
EndGlobalSection
EndGlobal
diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index ebf5f9c..744a855 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -1,11 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> <TargetFramework>net5.0</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> + <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/> </ItemGroup> - </Project> diff --git a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs index 3bed3fd..8b03c65 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class CreateRoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs index 07249fe..77ca954 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class RoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs index e21e6b4..9b8fbfe 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class UpdateRoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs index 514f82a..5c3dc6b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs index a784f5c..2241886 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class FriendServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs index 4d53283..6a0d128 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class LoginServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs index ad81057..cbe64b2 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class ProfilePictureServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs index adc4119..5852d46 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class RegisterServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs index b0efe10..0d7a8c1 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateFriendServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs index 8563953..19ba08f 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Http; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateProfilePictureServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs index b4e4400..ff20e6b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateUserServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs index ac7bba2..04b618b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using DevHive.Common.Models.Misc; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UserServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj index af419df..d6d0876 100644 --- a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj +++ b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -14,14 +14,6 @@ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Services\DevHive.Services.csproj" /> - - <ProjectReference Include="..\DevHive.Services.Models\DevHive.Services.Models.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index e500dd1..c4fac77 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Services; using Moq; using NUnit.Framework; diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 21d4862..aff34c9 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -10,7 +10,7 @@ using DevHive.Common.Models.Misc; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Services.Options; using DevHive.Services.Services; using Microsoft.AspNetCore.Identity; diff --git a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs index e61a107..37f259a 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Configurations.Mapping { diff --git a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs index 2b0f4ed..9a8e3d9 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Common.Models.Misc; using DevHive.Data.RelationModels; diff --git a/src/Services/DevHive.Services/DevHive.Services.csproj b/src/Services/DevHive.Services/DevHive.Services.csproj index 7a33166..1380248 100644 --- a/src/Services/DevHive.Services/DevHive.Services.csproj +++ b/src/Services/DevHive.Services/DevHive.Services.csproj @@ -18,12 +18,6 @@ <PackageReference Include="CloudinaryDotNet" Version="1.14.0" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Common\DevHive.Common.csproj" /> - <ProjectReference Include="..\DevHive.Services.Models\DevHive.Services.Models.csproj" /> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Services/DevHive.Services/Interfaces/IRoleService.cs b/src/Services/DevHive.Services/Interfaces/IRoleService.cs index d47728c..2c31b06 100644 --- a/src/Services/DevHive.Services/Interfaces/IRoleService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRoleService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Interfaces/IUserService.cs b/src/Services/DevHive.Services/Interfaces/IUserService.cs index 9e2b4e3..daa5e5e 100644 --- a/src/Services/DevHive.Services/Interfaces/IUserService.cs +++ b/src/Services/DevHive.Services/Interfaces/IUserService.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using DevHive.Common.Models.Identity; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Services/RoleService.cs b/src/Services/DevHive.Services/Services/RoleService.cs index a8b8e17..dbf8fcd 100644 --- a/src/Services/DevHive.Services/Services/RoleService.cs +++ b/src/Services/DevHive.Services/Services/RoleService.cs @@ -4,7 +4,7 @@ using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; namespace DevHive.Services.Services diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index 22d5052..f68e3aa 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -1,6 +1,6 @@ using AutoMapper; using DevHive.Services.Options; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using System.Threading.Tasks; using DevHive.Data.Models; using System; diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj index 0462967..65892c5 100644 --- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj +++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj @@ -1,14 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> <TargetFramework>net5.0</TargetFramework> </PropertyGroup> + <ItemGroup/> <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - </Project> diff --git a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs index 5f0e58f..cbba4ab 100644 --- a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs +++ b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Web.Models.Post.Rating +namespace DevHive.Web.Models.Rating { public class RatePostWebModel { diff --git a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs index a551fb8..8afd57e 100644 --- a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs +++ b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Web.Models.Post.Rating +namespace DevHive.Web.Models.Rating { public class ReadPostRatingWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs index 859cdd9..9beced4 100644 --- a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs +++ b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; -namespace DevHive.Web.Models.Identity.Role +namespace DevHive.Web.Models.Role { public class CreateRoleWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs index 99b0f50..680fb05 100644 --- a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs +++ b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; -namespace DevHive.Web.Models.Identity.Role +namespace DevHive.Web.Models.Role { public class RoleWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs index 3870481..f32839e 100644 --- a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs +++ b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; -namespace DevHive.Web.Models.Identity.Role +namespace DevHive.Web.Models.Role { public class UpdateRoleWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs index 297e1a5..9a2544d 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Web.Attributes; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class BaseUserWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs index ccd806f..c821721 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Web.Attributes; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class LoginWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs index 91c9487..e09ee08 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class ProfilePictureWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs index 0fc7ec6..754c8eb 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Web.Attributes; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class RegisterWebModel : BaseUserWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs index 154b64b..7f3361d 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class TokenWebModel { @@ -9,4 +9,4 @@ namespace DevHive.Web.Models.Identity.User public string Token { get; set; } } -}
\ No newline at end of file +} diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs index 6efe968..196d1e7 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class UpdateProfilePictureWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs index 62901f6..86f6bfe 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Web.Attributes; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using DevHive.Web.Models.Language; using DevHive.Web.Models.Technology; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class UpdateUserWebModel : BaseUserWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs b/src/Web/DevHive.Web.Models/User/UserWebModel.cs index 7ab8cca..37141d0 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/UserWebModel.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Common.Models.Misc; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using DevHive.Web.Models.Language; using DevHive.Web.Models.Technology; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class UserWebModel : BaseUserWebModel { diff --git a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs index c533bba..fc0a7ff 100644 --- a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs +++ b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using DevHive.Web.Attributes; -namespace DevHive.Web.Models.Identity.User +namespace DevHive.Web.Models.User { public class UsernameWebModel { diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj index 2b30bb8..ee390b5 100644 --- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj +++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -13,13 +13,6 @@ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Web\DevHive.Web.csproj" /> - <ProjectReference Include="..\DevHive.Web.Models\DevHive.Web.Models.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 067b4e4..b5deba0 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Web.Controllers; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index c1431c8..3e858f6 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Web.Controllers; -using DevHive.Web.Models.Identity.User; +using DevHive.Web.Models.User; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; diff --git a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs index 2ea2742..60f8503 100644 --- a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs +++ b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs @@ -1,6 +1,6 @@ using AutoMapper; -using DevHive.Web.Models.Identity.Role; -using DevHive.Services.Models.Identity.Role; +using DevHive.Web.Models.Role; +using DevHive.Services.Models.Role; namespace DevHive.Web.Configurations.Mapping { diff --git a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs index f58e7ca..14aaa3a 100644 --- a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs +++ b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,6 @@ using AutoMapper; -using DevHive.Services.Models.Identity.User; -using DevHive.Web.Models.Identity.User; +using DevHive.Services.Models.User; +using DevHive.Web.Models.User; using DevHive.Common.Models.Identity; namespace DevHive.Web.Configurations.Mapping diff --git a/src/Web/DevHive.Web/Controllers/RoleController.cs b/src/Web/DevHive.Web/Controllers/RoleController.cs index 0d2a2eb..1465795 100644 --- a/src/Web/DevHive.Web/Controllers/RoleController.cs +++ b/src/Web/DevHive.Web/Controllers/RoleController.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using AutoMapper; using System; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using Microsoft.AspNetCore.Authorization; namespace DevHive.Web.Controllers diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index 109bbaa..25faa8a 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; using AutoMapper; -using DevHive.Services.Models.Identity.User; -using DevHive.Web.Models.Identity.User; +using DevHive.Services.Models.User; +using DevHive.Web.Models.User; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using DevHive.Common.Models.Identity; diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index 71362ce..7ba07b1 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -20,11 +20,4 @@ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Web.Models\DevHive.Web.Models.csproj" /> - - <ProjectReference Include="..\DevHive.Services\DevHive.Services.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> </Project> |
