merge identity rename project refactoring branch

build-images.ps1

@@ -30,7 +30,7 @@ dotnet build $webSPAPathToJson
 dotnet publish $webSPAPathToJson -o $webSPAPathToPub
 
 # *** identitySvc image ***
-$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json"
+$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\Identity.API\project.json"
 Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow
 $identitySvcPathToPub = $scriptPath + "\pub\identity"
 Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow

eShopOnContainers-ServicesAndWebApps.sln

@@ -47,7 +47,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTest", "test\Services\U
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{24CD3B53-141E-4A07-9B0D-796641E1CF78}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.Identity", "src\Services\Identity\eShopOnContainers.Identity\eShopOnContainers.Identity.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Identity.API", "src\Services\Identity\eShopOnContainers.Identity\Identity.API.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

eShopOnContainers.sln

@@ -65,8 +65,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Infrastructure", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{02DF7FEE-C302-433D-A6CD-237A2569F236}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.Identity", "src\Services\Identity\eShopOnContainers.Identity\eShopOnContainers.Identity.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.xproj", "{621E7211-58D0-45FD-9600-1CB490BD930E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UITests", "src\Mobile\eShopOnContainers\eShopOnContainers.UITests\eShopOnContainers.UITests.csproj", "{E3B18084-842C-4B80-8E4A-A7E588EC3137}"
@@ -75,6 +73,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "s
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTest", "test\Services\UnitTest\UnitTest.xproj", "{7796F5D8-31FC-45A4-B673-19DE5BA194CF}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -716,54 +716,6 @@ Global
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x64.Build.0 = Release|Any CPU
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.ActiveCfg = Release|Any CPU
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU
 		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -956,6 +908,54 @@ Global
 		{7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x64.Build.0 = Release|Any CPU
 		{7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x86.ActiveCfg = Release|Any CPU
 		{7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x86.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.Build.0 = Debug|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU
+		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -986,10 +986,10 @@ Global
 		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367}
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{02DF7FEE-C302-433D-A6CD-237A2569F236} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
-		{A579E108-5445-403D-A407-339AC4D1611B} = {02DF7FEE-C302-433D-A6CD-237A2569F236}
 		{621E7211-58D0-45FD-9600-1CB490BD930E} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
 		{E3B18084-842C-4B80-8E4A-A7E588EC3137} = {B7B1D395-4E06-4036-BE86-C216756B9367}
 		{67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {778289CA-31F7-4464-8C2A-612EE846F8A7}
 		{7796F5D8-31FC-45A4-B673-19DE5BA194CF} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{A579E108-5445-403D-A407-339AC4D1611B} = {02DF7FEE-C302-433D-A6CD-237A2569F236}
 	EndGlobalSection
 EndGlobal

src/Services/Identity/Identity.API/Configuration/Config.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Options;
 using System.Collections.Generic;
 
-namespace eShopOnContainers.Identity.Configuration
+namespace Identity.API.Configuration
 {
     public class Config
     {

src/Services/Identity/Identity.API/Controllers/AccountController.cs

@@ -16,11 +16,11 @@ using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
-using eShopOnContainers.Identity.Services;
-using eShopOnContainers.Identity.Models;
+using Identity.API.Services;
+using Identity.API.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authorization;
-using eShopOnContainers.Identity.Models.AccountViewModels;
+using Identity.API.Models.AccountViewModels;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Authentication;
 

src/Services/Identity/Identity.API/Controllers/ConsentController.cs

@@ -10,8 +10,8 @@ using System.Threading.Tasks;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 using IdentityServer4.Quickstart.UI.Models;
-using eShopOnContainers.Identity.Models.AccountViewModels;
-using eShopOnContainers.Identity.Services;
+using Identity.API.Models.AccountViewModels;
+using Identity.API.Services;
 
 namespace IdentityServer4.Quickstart.UI.Controllers
 {

src/Services/Identity/Identity.API/Controllers/HomeController.cs

@@ -3,7 +3,7 @@
 
 
 using eShopOnContainers.Identity;
-using eShopOnContainers.Identity.Services;
+using Identity.API.Services;
 using IdentityServer4.Quickstart.UI.Models;
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Mvc;

src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs

@@ -3,8 +3,8 @@
     using AspNetCore.Identity;
     using EntityFrameworkCore;
     using Extensions.Logging;
-    using global::eShopOnContainers.Identity.Data;
-    using global::eShopOnContainers.Identity.Models;
+    using global::Identity.API.Data;
+    using global::Identity.API.Models;
     using Microsoft.AspNetCore.Builder;
     using System;
     using System.Collections.Generic;

src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using eShopOnContainers.Identity.Models;
+using Identity.API.Models;
 
-namespace eShopOnContainers.Identity.Data
+namespace Identity.API.Data
 {
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {

src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using eShopOnContainers.Identity.Data;
+using Identity.API.Data;
 
 namespace WebMVC.Migrations
 {

src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using eShopOnContainers.Identity.Data;
+using Identity.API.Data;
 
 namespace WebMVC.Migrations
 {

src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using eShopOnContainers.Identity.Data;
+using Identity.API.Data;
 
 namespace WebMVC.Migrations
 {

src/Services/Identity/Identity.API/Dockerfile

@@ -1,5 +1,5 @@
 FROM microsoft/aspnetcore:1.0.1
-ENTRYPOINT ["dotnet", "eShopOnContainers.Identity.dll"]
+ENTRYPOINT ["dotnet", "Identity.API.dll"]
 ARG source=.
 WORKDIR /app
 ENV ASPNETCORE_URLS http://*:5105

src/Services/Identity/Identity.API/Identity.API.xproj

@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a579e108-5445-403d-a407-339ac4d1611b</ProjectGuid>
-    <RootNamespace>eShopOnContainers.Identity</RootNamespace>
+    <RootNamespace>Identity.API</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
@@ -20,4 +20,4 @@
     <DnxInvisibleContent Include=".bowerrc" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs

@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class ConsentInputModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using IdentityServer4.Models;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class ConsentViewModel : ConsentInputModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class ExternalLoginConfirmationViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class ForgotPasswordViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class LoggedOutViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs

@@ -4,7 +4,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class LoginViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class LogoutViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class RegisterViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class ResetPasswordViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class SendCodeViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     public class VerifyCodeViewModel
     {

src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs

@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace eShopOnContainers.Identity.Models.AccountViewModels
+namespace Identity.API.Models.AccountViewModels
 {
     //public class _LoginViewModel : LoginViewModel
     //{

src/Services/Identity/Identity.API/Models/ApplicationUser.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 
-namespace eShopOnContainers.Identity.Models
+namespace Identity.API.Models
 {
     // Add profile data for application users by adding properties to the ApplicationUser class
     public class ApplicationUser : IdentityUser

src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class AddPhoneNumberViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class ChangePasswordViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class ConfigureTwoFactorViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class FactorViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class IndexViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Authentication;
 using Microsoft.AspNetCore.Identity;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class ManageLoginsViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class RemoveLoginViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class SetPasswordViewModel
     {

src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Models.ManageViewModels
+namespace Identity.API.Models.ManageViewModels
 {
     public class VerifyPhoneNumberViewModel
     {

src/Services/Identity/Identity.API/Services/EFLoginService.cs

@@ -1,11 +1,11 @@
-using eShopOnContainers.Identity.Models;
+using Identity.API.Models;
 using Microsoft.AspNetCore.Identity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public class EFLoginService : ILoginService<ApplicationUser>
     {

src/Services/Identity/Identity.API/Services/IEmailSender.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public interface IEmailSender
     {

src/Services/Identity/Identity.API/Services/ILoginService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public interface ILoginService<T>
     {

src/Services/Identity/Identity.API/Services/IRedirectService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public interface IRedirectService
     {

src/Services/Identity/Identity.API/Services/ISmsSender.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public interface ISmsSender
     {

src/Services/Identity/Identity.API/Services/MessageServices.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     // This class is used by the application to send Email and SMS
     // when you turn on two-factor authentication in ASP.NET Identity.

src/Services/Identity/Identity.API/Services/ProfileService.cs

@@ -5,11 +5,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using IdentityServer4.Models;
 using Microsoft.AspNetCore.Identity;
-using eShopOnContainers.Identity.Models;
+using Identity.API.Models;
 using System.Security.Claims;
 using IdentityModel;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public class ProfileService : IProfileService
     {

src/Services/Identity/Identity.API/Services/RedirectService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.Identity.Services
+namespace Identity.API.Services
 {
     public class RedirectService : IRedirectService
     {

src/Services/Identity/Identity.API/Startup.cs

@@ -9,10 +9,10 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using eShopOnContainers.Identity.Data;
-using eShopOnContainers.Identity.Models;
-using eShopOnContainers.Identity.Services;
-using eShopOnContainers.Identity.Configuration;
+using Identity.API.Data;
+using Identity.API.Models;
+using Identity.API.Services;
+using Identity.API.Configuration;
 using IdentityServer4.Services;
 using System.Threading;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;

src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml

@@ -1,4 +1,4 @@
-@model eShopOnContainers.Identity.Models.AccountViewModels.LoggedOutViewModel
+@model Identity.API.Models.AccountViewModels.LoggedOutViewModel
 
 <div class="container page-header">
     <h1>

src/Services/Identity/Identity.API/Views/Account/Login.cshtml

@@ -1,7 +1,7 @@
 @using System.Collections.Generic
 @using Microsoft.AspNetCore.Http
 @using Microsoft.AspNetCore.Http.Authentication
-@model eShopOnContainers.Identity.Models.AccountViewModels.LoginViewModel
+@model Identity.API.Models.AccountViewModels.LoginViewModel
 
 
 @{

src/Services/Identity/Identity.API/Views/Account/Logout.cshtml

@@ -1,4 +1,4 @@
-@model eShopOnContainers.Identity.Models.AccountViewModels.LogoutViewModel
+@model Identity.API.Models.AccountViewModels.LogoutViewModel
 
 <div class="container logout-page">
     <div class="page-header">

src/Services/Identity/Identity.API/Views/Account/Register.cshtml

@@ -1,4 +1,4 @@
-@using eShopOnContainers.Identity.Models.AccountViewModels
+@using Identity.API.Models.AccountViewModels
 @model RegisterViewModel
 @{
     ViewData["Title"] = "Register";

src/Services/Identity/Identity.API/Views/Consent/Index.cshtml

@@ -1,4 +1,4 @@
-@model eShopOnContainers.Identity.Models.AccountViewModels.ConsentViewModel
+@model Identity.API.Models.AccountViewModels.ConsentViewModel
 
 <div class="container page-consent">
     <div class="row page-header">

src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml

@@ -1,4 +1,4 @@
-@model eShopOnContainers.Identity.Models.AccountViewModels.ScopeViewModel
+@model Identity.API.Models.AccountViewModels.ScopeViewModel
 
 <li class="list-group-item">
     <label>

src/Services/Identity/Identity.API/Views/Shared/_LoginPartial.cshtml

@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Identity
-@using eShopOnContainers.Identity.Models
+@using Identity.API.Models
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager