diff --git a/Microsoft.Containerized-eShop.sln b/Microsoft.Containerized-eShop.sln deleted file mode 100644 index be4d9d3f0..000000000 --- a/Microsoft.Containerized-eShop.sln +++ /dev/null @@ -1,83 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microservices", "Microservices", "{91CF7717-08AB-4E65-B10E-0B426F01E2E8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web Apps", "Web Apps", "{E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{F61357CE-1CC2-410E-8776-B16EEBC98EB8}" - ProjectSection(SolutionItems) = preProject - src\Mobile\Xamarin projects when created.txt = src\Mobile\Xamarin projects when created.txt - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Containerized-eShop.WebMVC", "src\Web\Microsoft.Containerized-eShop.WebMVC\Microsoft.Containerized-eShop.WebMVC.xproj", "{1D40C583-ABF0-400B-8C63-2C3669268C8B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalog", "Catalog", "{326A7FB3-5295-468C-A4FE-67DCB823E1E5}" - ProjectSection(SolutionItems) = preProject - src\Microservices\Catalog\Additional related projects-images like DataSources or related microservices.txt = src\Microservices\Catalog\Additional related projects-images like DataSources or related microservices.txt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}" - ProjectSection(SolutionItems) = preProject - src\Microservices\Basket\Additional related projects-images like Redis Cache.txt = src\Microservices\Basket\Additional related projects-images like Redis Cache.txt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ordering", "Ordering", "{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}" - ProjectSection(SolutionItems) = preProject - src\Microservices\Ordering\Additional projects-images like DataSources or Related microservices.txt = src\Microservices\Ordering\Additional projects-images like DataSources or Related microservices.txt - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Containerized-eShop.BasketAPI", "src\Microservices\Basket\Microsoft.Containerized-eShop.BasketAPI\Microsoft.Containerized-eShop.BasketAPI.xproj", "{F6A031AF-D7AE-47C1-AB53-1456A528280C}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Containerized-eShop.OrderingAPI", "src\Microservices\Ordering\Microsoft.Containerized-eShop.OrderingAPI\Microsoft.Containerized-eShop.OrderingAPI.xproj", "{941B2DBA-8827-447E-AC82-7BEB118A968B}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Containerized-eShop.CatalogAPI", "src\Microservices\Catalog\Microsoft.Containerized-eShop.CatalogAPI\Microsoft.Containerized-eShop.CatalogAPI.xproj", "{2D26AFB4-0ECB-4009-98D6-CAB5825E62A8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1D40C583-ABF0-400B-8C63-2C3669268C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D40C583-ABF0-400B-8C63-2C3669268C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D40C583-ABF0-400B-8C63-2C3669268C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D40C583-ABF0-400B-8C63-2C3669268C8B}.Release|Any CPU.Build.0 = Release|Any CPU - {F6A031AF-D7AE-47C1-AB53-1456A528280C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6A031AF-D7AE-47C1-AB53-1456A528280C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6A031AF-D7AE-47C1-AB53-1456A528280C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6A031AF-D7AE-47C1-AB53-1456A528280C}.Release|Any CPU.Build.0 = Release|Any CPU - {941B2DBA-8827-447E-AC82-7BEB118A968B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {941B2DBA-8827-447E-AC82-7BEB118A968B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {941B2DBA-8827-447E-AC82-7BEB118A968B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {941B2DBA-8827-447E-AC82-7BEB118A968B}.Release|Any CPU.Build.0 = Release|Any CPU - {2D26AFB4-0ECB-4009-98D6-CAB5825E62A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D26AFB4-0ECB-4009-98D6-CAB5825E62A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D26AFB4-0ECB-4009-98D6-CAB5825E62A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D26AFB4-0ECB-4009-98D6-CAB5825E62A8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {91CF7717-08AB-4E65-B10E-0B426F01E2E8} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {F61357CE-1CC2-410E-8776-B16EEBC98EB8} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {1D40C583-ABF0-400B-8C63-2C3669268C8B} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} - {326A7FB3-5295-468C-A4FE-67DCB823E1E5} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} - {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} - {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} - {F6A031AF-D7AE-47C1-AB53-1456A528280C} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} - {941B2DBA-8827-447E-AC82-7BEB118A968B} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} - {2D26AFB4-0ECB-4009-98D6-CAB5825E62A8} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5} - EndGlobalSection -EndGlobal diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln new file mode 100644 index 000000000..4d8444598 --- /dev/null +++ b/eShopOnContainers.sln @@ -0,0 +1,116 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{91CF7717-08AB-4E65-B10E-0B426F01E2E8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web Apps", "Web Apps", "{E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{F61357CE-1CC2-410E-8776-B16EEBC98EB8}" + ProjectSection(SolutionItems) = preProject + src\Mobile\Xamarin projects when created.txt = src\Mobile\Xamarin projects when created.txt + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalog", "Catalog", "{326A7FB3-5295-468C-A4FE-67DCB823E1E5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ordering", "Ordering", "{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebMVC", "src\Web\Microsoft.eShopOnContainers.WebMVC\eShopOnContainers.WebMVC.xproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Basket.API", "src\Services\Basket\Basket.API\Basket.API.xproj", "{2110CBB0-3B38-4EE4-A743-DF6968D80D90}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Catalog.API", "src\Services\Catalog\Catalog.API\Catalog.API.xproj", "{42681D9D-750A-4DF7-BD9F-9292CFD5C253}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.API", "src\Services\Ordering\Ordering.API\Ordering.API.xproj", "{231226CE-690B-4979-8870-9A79D80928E2}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Basket.Model", "src\Services\Basket\Basket.Model\Basket.Model.xproj", "{C666D3AB-BBD9-4209-8161-C4B5028C6BC3}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Catalog.Model", "src\Services\Catalog\Catalog.Model\Catalog.Model.xproj", "{586D8F57-492B-4365-A87B-38A8F40096AB}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Domain", "src\Services\Ordering\Ordering.Domain\Ordering.Domain.xproj", "{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Basket.RedisData", "src\Services\Basket\Basket.RedisData\Basket.RedisData.xproj", "{D78C4572-F8D8-4B49-ACD0-F0567CB15F0D}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Catalog.SqlData", "src\Services\Catalog\Catalog.SqlData\Catalog.SqlData.xproj", "{D9FDCDDA-7823-4043-8C40-634E5FD78046}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.SqlData", "src\Services\Ordering\Ordering.SqlData\Ordering.SqlData.xproj", "{5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|Any CPU.Build.0 = Release|Any CPU + {2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|Any CPU.Build.0 = Release|Any CPU + {42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|Any CPU.Build.0 = Release|Any CPU + {231226CE-690B-4979-8870-9A79D80928E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {231226CE-690B-4979-8870-9A79D80928E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {231226CE-690B-4979-8870-9A79D80928E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {231226CE-690B-4979-8870-9A79D80928E2}.Release|Any CPU.Build.0 = Release|Any CPU + {C666D3AB-BBD9-4209-8161-C4B5028C6BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C666D3AB-BBD9-4209-8161-C4B5028C6BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C666D3AB-BBD9-4209-8161-C4B5028C6BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C666D3AB-BBD9-4209-8161-C4B5028C6BC3}.Release|Any CPU.Build.0 = Release|Any CPU + {586D8F57-492B-4365-A87B-38A8F40096AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {586D8F57-492B-4365-A87B-38A8F40096AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {586D8F57-492B-4365-A87B-38A8F40096AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {586D8F57-492B-4365-A87B-38A8F40096AB}.Release|Any CPU.Build.0 = Release|Any CPU + {F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|Any CPU.Build.0 = Release|Any CPU + {D78C4572-F8D8-4B49-ACD0-F0567CB15F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D78C4572-F8D8-4B49-ACD0-F0567CB15F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D78C4572-F8D8-4B49-ACD0-F0567CB15F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D78C4572-F8D8-4B49-ACD0-F0567CB15F0D}.Release|Any CPU.Build.0 = Release|Any CPU + {D9FDCDDA-7823-4043-8C40-634E5FD78046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9FDCDDA-7823-4043-8C40-634E5FD78046}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9FDCDDA-7823-4043-8C40-634E5FD78046}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9FDCDDA-7823-4043-8C40-634E5FD78046}.Release|Any CPU.Build.0 = Release|Any CPU + {5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {91CF7717-08AB-4E65-B10E-0B426F01E2E8} = {932D8224-11F6-4D07-B109-DA28AD288A63} + {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} = {932D8224-11F6-4D07-B109-DA28AD288A63} + {F61357CE-1CC2-410E-8776-B16EEBC98EB8} = {932D8224-11F6-4D07-B109-DA28AD288A63} + {326A7FB3-5295-468C-A4FE-67DCB823E1E5} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} + {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} + {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} + {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} + {2110CBB0-3B38-4EE4-A743-DF6968D80D90} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} + {42681D9D-750A-4DF7-BD9F-9292CFD5C253} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5} + {231226CE-690B-4979-8870-9A79D80928E2} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} + {C666D3AB-BBD9-4209-8161-C4B5028C6BC3} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} + {586D8F57-492B-4365-A87B-38A8F40096AB} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5} + {F5598DCB-6DDE-4661-AD9D-A55612DA7E76} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} + {D78C4572-F8D8-4B49-ACD0-F0567CB15F0D} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} + {D9FDCDDA-7823-4043-8C40-634E5FD78046} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5} + {5DA6EF13-C7E0-4EC4-8599-A61C6AC2628D} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} + EndGlobalSection +EndGlobal diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Additional projects-images like DataSources or Redis Cache.txt b/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Additional projects-images like DataSources or Redis Cache.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Microservices/Basket/Additional related projects-images like Redis Cache.txt b/src/Services/Basket/Additional related projects-images like Redis Cache.txt similarity index 100% rename from src/Microservices/Basket/Additional related projects-images like Redis Cache.txt rename to src/Services/Basket/Additional related projects-images like Redis Cache.txt diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Microsoft.Containerized-eShop.CatalogAPI.xproj b/src/Services/Basket/Basket.API/Basket.API.xproj similarity index 86% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Microsoft.Containerized-eShop.CatalogAPI.xproj rename to src/Services/Basket/Basket.API/Basket.API.xproj index a0c5e0e7e..d734a83ad 100644 --- a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Microsoft.Containerized-eShop.CatalogAPI.xproj +++ b/src/Services/Basket/Basket.API/Basket.API.xproj @@ -6,8 +6,8 @@ - 2d26afb4-0ecb-4009-98d6-cab5825e62a8 - Microsoft.Containerized_eShop.CatalogAPI + 2110cbb0-3b38-4ee4-a743-df6968d80d90 + Microsoft.eShopOnContainers.Services.Basket.API .\obj .\bin\ v4.6 @@ -16,4 +16,4 @@ 2.0 - + \ No newline at end of file diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Controllers/ValuesController.cs b/src/Services/Basket/Basket.API/Controllers/ValuesController.cs similarity index 92% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Controllers/ValuesController.cs rename to src/Services/Basket/Basket.API/Controllers/ValuesController.cs index 9eb893914..689d9a37a 100644 --- a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Controllers/ValuesController.cs +++ b/src/Services/Basket/Basket.API/Controllers/ValuesController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace Microsoft.Containerized_eShop.OrderingAPI.Controllers +namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers { [Route("api/[controller]")] public class ValuesController : Controller diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Program.cs b/src/Services/Basket/Basket.API/Program.cs similarity index 90% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Program.cs rename to src/Services/Basket/Basket.API/Program.cs index 8b71efb03..712aafef8 100644 --- a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Builder; -namespace Microsoft.Containerized_eShop.BasketAPI +namespace Microsoft.eShopOnContainers.Services.Basket.API { public class Program { diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Project_Readme.html b/src/Services/Basket/Basket.API/Project_Readme.html similarity index 100% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Project_Readme.html rename to src/Services/Basket/Basket.API/Project_Readme.html diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Properties/launchSettings.json b/src/Services/Basket/Basket.API/Properties/launchSettings.json similarity index 84% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Properties/launchSettings.json rename to src/Services/Basket/Basket.API/Properties/launchSettings.json index cdfef8a93..8ac2d090f 100644 --- a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Properties/launchSettings.json +++ b/src/Services/Basket/Basket.API/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2929/", + "applicationUrl": "http://localhost:2160/", "sslPort": 0 } }, @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Microsoft.Containerized_eShop.OrderingAPI": { + "Microsoft.eShopOnContainers.Services.Basket.API": { "commandName": "Project", "launchBrowser": true, "launchUrl": "http://localhost:5000/api/values", diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs similarity index 96% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Startup.cs rename to src/Services/Basket/Basket.API/Startup.cs index 6745402cc..78941ddc0 100644 --- a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.Containerized_eShop.BasketAPI +namespace Microsoft.eShopOnContainers.Services.Basket.API { public class Startup { diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json similarity index 100% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/appsettings.json rename to src/Services/Basket/Basket.API/appsettings.json diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/project.json b/src/Services/Basket/Basket.API/project.json similarity index 100% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/project.json rename to src/Services/Basket/Basket.API/project.json diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/web.config b/src/Services/Basket/Basket.API/web.config similarity index 100% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/web.config rename to src/Services/Basket/Basket.API/web.config diff --git a/src/Services/Basket/Basket.Model/Basket.Model.xproj b/src/Services/Basket/Basket.Model/Basket.Model.xproj new file mode 100644 index 000000000..7ea373459 --- /dev/null +++ b/src/Services/Basket/Basket.Model/Basket.Model.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + c666d3ab-bbd9-4209-8161-c4b5028c6bc3 + Microsoft.eShopOnContainers.Services.Basket.Model + .\obj + .\bin\ + v4.6 + + + + 2.0 + + + diff --git a/src/Services/Basket/Basket.Model/Properties/AssemblyInfo.cs b/src/Services/Basket/Basket.Model/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..57594d988 --- /dev/null +++ b/src/Services/Basket/Basket.Model/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Basket.Model")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c666d3ab-bbd9-4209-8161-c4b5028c6bc3")] diff --git a/src/Services/Basket/Basket.Model/project.json b/src/Services/Basket/Basket.Model/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Basket/Basket.Model/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Services/Basket/Basket.RedisData/Basket.RedisData.xproj b/src/Services/Basket/Basket.RedisData/Basket.RedisData.xproj new file mode 100644 index 000000000..f63875167 --- /dev/null +++ b/src/Services/Basket/Basket.RedisData/Basket.RedisData.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + d78c4572-f8d8-4b49-acd0-f0567cb15f0d + Microsoft.eShopOnContainers.Services.Basket.RedisData + .\obj + .\bin\ + v4.6 + + + + 2.0 + + + diff --git a/src/Services/Basket/Basket.RedisData/Properties/AssemblyInfo.cs b/src/Services/Basket/Basket.RedisData/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..e93d7042f --- /dev/null +++ b/src/Services/Basket/Basket.RedisData/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Basket.RedisData")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("d78c4572-f8d8-4b49-acd0-f0567cb15f0d")] diff --git a/src/Services/Basket/Basket.RedisData/project.json b/src/Services/Basket/Basket.RedisData/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Basket/Basket.RedisData/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Microservices/Catalog/Additional related projects-images like DataSources or related microservices.txt b/src/Services/Catalog/Additional related projects-images like DataSources or related microservices.txt similarity index 100% rename from src/Microservices/Catalog/Additional related projects-images like DataSources or related microservices.txt rename to src/Services/Catalog/Additional related projects-images like DataSources or related microservices.txt diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Microsoft.Containerized-eShop.OrderingAPI.xproj b/src/Services/Catalog/Catalog.API/Catalog.API.xproj similarity index 86% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Microsoft.Containerized-eShop.OrderingAPI.xproj rename to src/Services/Catalog/Catalog.API/Catalog.API.xproj index 48bbf629e..f3fba7286 100644 --- a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Microsoft.Containerized-eShop.OrderingAPI.xproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.xproj @@ -6,8 +6,8 @@ - 941b2dba-8827-447e-ac82-7beb118a968b - Microsoft.Containerized_eShop.OrderingAPI + 42681d9d-750a-4df7-bd9f-9292cfd5c253 + Microsoft.eShopOnContainers.Services.Catalog.API .\obj .\bin\ v4.6 @@ -16,4 +16,4 @@ 2.0 - + \ No newline at end of file diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Controllers/ValuesController.cs b/src/Services/Catalog/Catalog.API/Controllers/ValuesController.cs similarity index 92% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Controllers/ValuesController.cs rename to src/Services/Catalog/Catalog.API/Controllers/ValuesController.cs index 09a1b5cbd..e8b1a90c3 100644 --- a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Controllers/ValuesController.cs +++ b/src/Services/Catalog/Catalog.API/Controllers/ValuesController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace Microsoft.Containerized_eShop.CatalogAPI.Controllers +namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers { [Route("api/[controller]")] public class ValuesController : Controller diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs similarity index 90% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Program.cs rename to src/Services/Catalog/Catalog.API/Program.cs index 726068311..5e8b75301 100644 --- a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Builder; -namespace Microsoft.Containerized_eShop.CatalogAPI +namespace Microsoft.eShopOnContainers.Services.Catalog.API { public class Program { diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Project_Readme.html b/src/Services/Catalog/Catalog.API/Project_Readme.html similarity index 100% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Project_Readme.html rename to src/Services/Catalog/Catalog.API/Project_Readme.html diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Properties/launchSettings.json b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json similarity index 84% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Properties/launchSettings.json rename to src/Services/Catalog/Catalog.API/Properties/launchSettings.json index 93be3125c..25361b864 100644 --- a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Properties/launchSettings.json +++ b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2923/", + "applicationUrl": "http://localhost:2418/", "sslPort": 0 } }, @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Microsoft.Containerized_eShop.BasketAPI": { + "Microsoft.eShopOnContainers.Services.Catalog.API": { "commandName": "Project", "launchBrowser": true, "launchUrl": "http://localhost:5000/api/values", diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs similarity index 96% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Startup.cs rename to src/Services/Catalog/Catalog.API/Startup.cs index 92a09e5d5..773e0ef05 100644 --- a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.Containerized_eShop.CatalogAPI +namespace Microsoft.eShopOnContainers.Services.Catalog.API { public class Startup { diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/appsettings.json b/src/Services/Catalog/Catalog.API/appsettings.json similarity index 100% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/appsettings.json rename to src/Services/Catalog/Catalog.API/appsettings.json diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/project.json b/src/Services/Catalog/Catalog.API/project.json similarity index 100% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/project.json rename to src/Services/Catalog/Catalog.API/project.json diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/web.config b/src/Services/Catalog/Catalog.API/web.config similarity index 100% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/web.config rename to src/Services/Catalog/Catalog.API/web.config diff --git a/src/Services/Catalog/Catalog.Model/Catalog.Model.xproj b/src/Services/Catalog/Catalog.Model/Catalog.Model.xproj new file mode 100644 index 000000000..c7f0bd5ae --- /dev/null +++ b/src/Services/Catalog/Catalog.Model/Catalog.Model.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 586d8f57-492b-4365-a87b-38a8f40096ab + Microsoft.eShopOnContainers.Services.Catalog.Model + .\obj + .\bin\ + v4.6 + + + + 2.0 + + + diff --git a/src/Services/Catalog/Catalog.Model/Properties/AssemblyInfo.cs b/src/Services/Catalog/Catalog.Model/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..51ac23d74 --- /dev/null +++ b/src/Services/Catalog/Catalog.Model/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Catalog.Model")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("586d8f57-492b-4365-a87b-38a8f40096ab")] diff --git a/src/Services/Catalog/Catalog.Model/project.json b/src/Services/Catalog/Catalog.Model/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Catalog/Catalog.Model/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Services/Catalog/Catalog.SqlData/Catalog.SqlData.xproj b/src/Services/Catalog/Catalog.SqlData/Catalog.SqlData.xproj new file mode 100644 index 000000000..a43e93f0f --- /dev/null +++ b/src/Services/Catalog/Catalog.SqlData/Catalog.SqlData.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + d9fdcdda-7823-4043-8c40-634e5fd78046 + Microsoft.eShopOnContainers.Services.Catalog.SqlData + .\obj + .\bin\ + v4.6 + + + + 2.0 + + + diff --git a/src/Services/Catalog/Catalog.SqlData/Properties/AssemblyInfo.cs b/src/Services/Catalog/Catalog.SqlData/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..85e487e0f --- /dev/null +++ b/src/Services/Catalog/Catalog.SqlData/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Catalog.SqlData")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("d9fdcdda-7823-4043-8c40-634e5fd78046")] diff --git a/src/Services/Catalog/Catalog.SqlData/project.json b/src/Services/Catalog/Catalog.SqlData/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Catalog/Catalog.SqlData/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Microservices/Ordering/Additional projects-images like DataSources or Related microservices.txt b/src/Services/Ordering/Additional projects-images like DataSources or Related microservices.txt similarity index 100% rename from src/Microservices/Ordering/Additional projects-images like DataSources or Related microservices.txt rename to src/Services/Ordering/Additional projects-images like DataSources or Related microservices.txt diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Controllers/ValuesController.cs b/src/Services/Ordering/Ordering.API/Controllers/ValuesController.cs similarity index 92% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Controllers/ValuesController.cs rename to src/Services/Ordering/Ordering.API/Controllers/ValuesController.cs index ebeef6ce5..3ddc0705b 100644 --- a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Controllers/ValuesController.cs +++ b/src/Services/Ordering/Ordering.API/Controllers/ValuesController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace Microsoft.Containerized_eShop.BasketAPI.Controllers +namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers { [Route("api/[controller]")] public class ValuesController : Controller diff --git a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Microsoft.Containerized-eShop.BasketAPI.xproj b/src/Services/Ordering/Ordering.API/Ordering.API.xproj similarity index 86% rename from src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Microsoft.Containerized-eShop.BasketAPI.xproj rename to src/Services/Ordering/Ordering.API/Ordering.API.xproj index cf81279a5..4781f6351 100644 --- a/src/Microservices/Basket/Microsoft.Containerized-eShop.BasketAPI/Microsoft.Containerized-eShop.BasketAPI.xproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.xproj @@ -6,8 +6,8 @@ - f6a031af-d7ae-47c1-ab53-1456a528280c - Microsoft.Containerized_eShop.BasketAPI + 231226ce-690b-4979-8870-9a79d80928e2 + Microsoft.eShopOnContainers.Services.Ordering.API .\obj .\bin\ v4.6 @@ -16,4 +16,4 @@ 2.0 - + \ No newline at end of file diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs similarity index 90% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Program.cs rename to src/Services/Ordering/Ordering.API/Program.cs index 0023974c5..93063eca1 100644 --- a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Builder; -namespace Microsoft.Containerized_eShop.OrderingAPI +namespace Microsoft.eShopOnContainers.Services.Ordering.API { public class Program { diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Project_Readme.html b/src/Services/Ordering/Ordering.API/Project_Readme.html similarity index 100% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Project_Readme.html rename to src/Services/Ordering/Ordering.API/Project_Readme.html diff --git a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Properties/launchSettings.json b/src/Services/Ordering/Ordering.API/Properties/launchSettings.json similarity index 84% rename from src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Properties/launchSettings.json rename to src/Services/Ordering/Ordering.API/Properties/launchSettings.json index f64d22261..f0374efc5 100644 --- a/src/Microservices/Catalog/Microsoft.Containerized-eShop.CatalogAPI/Properties/launchSettings.json +++ b/src/Services/Ordering/Ordering.API/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2933/", + "applicationUrl": "http://localhost:2446/", "sslPort": 0 } }, @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Microsoft.Containerized_eShop.CatalogAPI": { + "Microsoft.eShopOnContainers.Services.Ordering.API": { "commandName": "Project", "launchBrowser": true, "launchUrl": "http://localhost:5000/api/values", diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs similarity index 96% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Startup.cs rename to src/Services/Ordering/Ordering.API/Startup.cs index 99ac7306c..2b6b56448 100644 --- a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.Containerized_eShop.OrderingAPI +namespace Microsoft.eShopOnContainers.Services.Ordering.API { public class Startup { diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/appsettings.json b/src/Services/Ordering/Ordering.API/appsettings.json similarity index 100% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/appsettings.json rename to src/Services/Ordering/Ordering.API/appsettings.json diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/project.json b/src/Services/Ordering/Ordering.API/project.json similarity index 100% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/project.json rename to src/Services/Ordering/Ordering.API/project.json diff --git a/src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/web.config b/src/Services/Ordering/Ordering.API/web.config similarity index 100% rename from src/Microservices/Ordering/Microsoft.Containerized-eShop.OrderingAPI/web.config rename to src/Services/Ordering/Ordering.API/web.config diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj new file mode 100644 index 000000000..a98e249e1 --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + f5598dcb-6dde-4661-ad9d-a55612da7e76 + Microsoft.eShopOnContainers.Services.Ordering.Domain + .\obj + .\bin\ + v4.6 + + + + 2.0 + + + diff --git a/src/Services/Ordering/Ordering.Domain/Properties/AssemblyInfo.cs b/src/Services/Ordering/Ordering.Domain/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..a16c5b744 --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Ordering.Domain")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f5598dcb-6dde-4661-ad9d-a55612da7e76")] diff --git a/src/Services/Ordering/Ordering.Domain/SeedWork/AggregateRoot.cs b/src/Services/Ordering/Ordering.Domain/SeedWork/AggregateRoot.cs new file mode 100644 index 000000000..85d993536 --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/SeedWork/AggregateRoot.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork +{ + public class AggregateRoot + { + } +} diff --git a/src/Services/Ordering/Ordering.Domain/SeedWork/Entity.cs b/src/Services/Ordering/Ordering.Domain/SeedWork/Entity.cs new file mode 100644 index 000000000..2452f8e29 --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/SeedWork/Entity.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork +{ + public class Entity + { + } +} diff --git a/src/Services/Ordering/Ordering.Domain/project.json b/src/Services/Ordering/Ordering.Domain/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Ordering/Ordering.Domain/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Services/Ordering/Ordering.SqlData/Ordering.SqlData.xproj b/src/Services/Ordering/Ordering.SqlData/Ordering.SqlData.xproj new file mode 100644 index 000000000..5f9c67bd6 --- /dev/null +++ b/src/Services/Ordering/Ordering.SqlData/Ordering.SqlData.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 5da6ef13-c7e0-4ec4-8599-a61c6ac2628d + Microsoft.eShopOnContainers.Services.Ordering.SqlData + .\obj + .\bin\ + v4.6 + + + 2.0 + + + \ No newline at end of file diff --git a/src/Services/Ordering/Ordering.SqlData/Properties/AssemblyInfo.cs b/src/Services/Ordering/Ordering.SqlData/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..322d94a72 --- /dev/null +++ b/src/Services/Ordering/Ordering.SqlData/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.eShopOnContainers.Services.Ordering.Infrastructure")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5da6ef13-c7e0-4ec4-8599-a61c6ac2628d")] diff --git a/src/Services/Ordering/Ordering.SqlData/SeedWork/Repository.cs b/src/Services/Ordering/Ordering.SqlData/SeedWork/Repository.cs new file mode 100644 index 000000000..0820bb181 --- /dev/null +++ b/src/Services/Ordering/Ordering.SqlData/SeedWork/Repository.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.SeedWork +{ + public class Repository + { + } +} diff --git a/src/Services/Ordering/Ordering.SqlData/project.json b/src/Services/Ordering/Ordering.SqlData/project.json new file mode 100644 index 000000000..864b9a5f3 --- /dev/null +++ b/src/Services/Ordering/Ordering.SqlData/project.json @@ -0,0 +1,13 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/_ViewImports.cshtml b/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/_ViewImports.cshtml deleted file mode 100644 index a85eaab29..000000000 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/_ViewImports.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using Microsoft.Containerized_eShop.WebMVC -@using Microsoft.Containerized_eShop.WebMVC.Models -@using Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels -@using Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels -@using Microsoft.AspNetCore.Identity -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/.bowerrc b/src/Web/Microsoft.eShopOnContainers.WebMVC/.bowerrc similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/.bowerrc rename to src/Web/Microsoft.eShopOnContainers.WebMVC/.bowerrc diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/AccountController.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/AccountController.cs similarity index 98% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/AccountController.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/AccountController.cs index c703a6fe7..402a87e10 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/AccountController.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/AccountController.cs @@ -8,11 +8,11 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Logging; -using Microsoft.Containerized_eShop.WebMVC.Models; -using Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels; -using Microsoft.Containerized_eShop.WebMVC.Services; +using Microsoft.eShopOnContainers.WebMVC.Models; +using Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels; +using Microsoft.eShopOnContainers.WebMVC.Services; -namespace Microsoft.Containerized_eShop.WebMVC.Controllers +namespace Microsoft.eShopOnContainers.WebMVC.Controllers { [Authorize] public class AccountController : Controller diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/HomeController.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/HomeController.cs similarity index 91% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/HomeController.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/HomeController.cs index 0fb014967..f2dc170d6 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/HomeController.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/HomeController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace Microsoft.Containerized_eShop.WebMVC.Controllers +namespace Microsoft.eShopOnContainers.WebMVC.Controllers { public class HomeController : Controller { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/ManageController.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/ManageController.cs similarity index 98% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/ManageController.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/ManageController.cs index 9cb83d27b..645890327 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Controllers/ManageController.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/ManageController.cs @@ -6,11 +6,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Microsoft.Containerized_eShop.WebMVC.Models; -using Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels; -using Microsoft.Containerized_eShop.WebMVC.Services; +using Microsoft.eShopOnContainers.WebMVC.Models; +using Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels; +using Microsoft.eShopOnContainers.WebMVC.Services; -namespace Microsoft.Containerized_eShop.WebMVC.Controllers +namespace Microsoft.eShopOnContainers.WebMVC.Controllers { [Authorize] public class ManageController : Controller diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/ApplicationDbContext.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/ApplicationDbContext.cs similarity index 88% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Data/ApplicationDbContext.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Data/ApplicationDbContext.cs index 2e1a42444..efdd11b46 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/ApplicationDbContext.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/ApplicationDbContext.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using Microsoft.Containerized_eShop.WebMVC.Models; +using Microsoft.eShopOnContainers.WebMVC.Models; -namespace Microsoft.Containerized_eShop.WebMVC.Data +namespace Microsoft.eShopOnContainers.WebMVC.Data { public class ApplicationDbContext : IdentityDbContext { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 94% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs index a63e47f32..9887e1357 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations +namespace Microsoft.eShopOnContainers.WebMVC.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("00000000000000_CreateIdentitySchema")] @@ -126,7 +126,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations b.ToTable("AspNetUserTokens"); }); - modelBuilder.Entity("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser", b => + modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser", b => { b.Property("Id"); @@ -185,7 +185,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Claims") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); @@ -193,7 +193,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Logins") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); @@ -206,7 +206,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Roles") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 99% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs index d38eefdc6..bdd36731f 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations +namespace Microsoft.eShopOnContainers.WebMVC.Data.Migrations { public partial class CreateIdentitySchema : Migration { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 94% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 775967d63..62708ab26 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations +namespace Microsoft.eShopOnContainers.WebMVC.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] partial class ApplicationDbContextModelSnapshot : ModelSnapshot @@ -125,7 +125,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations b.ToTable("AspNetUserTokens"); }); - modelBuilder.Entity("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser", b => + modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser", b => { b.Property("Id"); @@ -184,7 +184,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Claims") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); @@ -192,7 +192,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Logins") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); @@ -205,7 +205,7 @@ namespace Microsoft.Containerized_eShop.WebMVC.Data.Migrations .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); - b.HasOne("Microsoft.Containerized_eShop.WebMVC.Models.ApplicationUser") + b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser") .WithMany("Roles") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 80% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs index d8d0a3016..c256b098c 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class ExternalLoginConfirmationViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 79% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs index ff236b805..74bbada93 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class ForgotPasswordViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/LoginViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/LoginViewModel.cs similarity index 86% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/LoginViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/LoginViewModel.cs index 3734390a4..cc5245149 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/LoginViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/LoginViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class LoginViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/RegisterViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/RegisterViewModel.cs similarity index 91% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/RegisterViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/RegisterViewModel.cs index 525a0f2e0..77127d86b 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/RegisterViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/RegisterViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class RegisterViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 91% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs index 469bc2f51..0ae402f4c 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class ResetPasswordViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs similarity index 85% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs index 24da6c510..8fc47bdb1 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class SendCodeViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 88% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs index e9c3459f5..bdc893691 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.AccountViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels { public class VerifyCodeViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ApplicationUser.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ApplicationUser.cs similarity index 85% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ApplicationUser.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ApplicationUser.cs index 8ed888d6d..ba6a2914a 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ApplicationUser.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ApplicationUser.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -namespace Microsoft.Containerized_eShop.WebMVC.Models +namespace Microsoft.eShopOnContainers.WebMVC.Models { // Add profile data for application users by adding properties to the ApplicationUser class public class ApplicationUser : IdentityUser diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 82% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs index 4eb2702f6..fa89f1088 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class AddPhoneNumberViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 92% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs index 195a63597..34d7cd732 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class ChangePasswordViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 82% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs index f7499ae92..9ed3b9b1d 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class ConfigureTwoFactorViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/FactorViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/FactorViewModel.cs similarity index 73% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/FactorViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/FactorViewModel.cs index fce0f11c8..f1191cd1a 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/FactorViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/FactorViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class FactorViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/IndexViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/IndexViewModel.cs similarity index 86% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/IndexViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/IndexViewModel.cs index 77fa76d10..33771c140 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/IndexViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/IndexViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class IndexViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 84% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs index 47eb3ed96..1944dd9ff 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Authentication; using Microsoft.AspNetCore.Identity; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class ManageLoginsViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 80% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs index bab26b2cc..1178c3ccb 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class RemoveLoginViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 91% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs index ee3c3f529..11cfdade5 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class SetPasswordViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 84% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs index 16034541e..ce606825f 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Models.ManageViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels { public class VerifyPhoneNumberViewModel { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Program.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Program.cs similarity index 91% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Program.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Program.cs index 1149964dd..f0ac25961 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Program.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Program.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.Containerized_eShop.WebMVC +namespace Microsoft.eShopOnContainers.WebMVC { public class Program { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Project_Readme.html b/src/Web/Microsoft.eShopOnContainers.WebMVC/Project_Readme.html similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Project_Readme.html rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Project_Readme.html diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Properties/launchSettings.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/Properties/launchSettings.json similarity index 84% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Properties/launchSettings.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Properties/launchSettings.json index f6b932e80..9cc22bcd1 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Properties/launchSettings.json +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2795/", + "applicationUrl": "http://localhost:2113/", "sslPort": 0 } }, @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Microsoft.Containerized_eShop.WebMVC": { + "Microsoft.eShopOnContainers.WebMVC": { "commandName": "Project", "launchBrowser": true, "launchUrl": "http://localhost:5000", diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/IEmailSender.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/IEmailSender.cs similarity index 80% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Services/IEmailSender.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Services/IEmailSender.cs index fbe61ce4f..f443e52ff 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/IEmailSender.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/IEmailSender.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Services +namespace Microsoft.eShopOnContainers.WebMVC.Services { public interface IEmailSender { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/ISmsSender.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/ISmsSender.cs similarity index 78% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Services/ISmsSender.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Services/ISmsSender.cs index cd11c1683..b0869b390 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/ISmsSender.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/ISmsSender.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Services +namespace Microsoft.eShopOnContainers.WebMVC.Services { public interface ISmsSender { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/MessageServices.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/MessageServices.cs similarity index 93% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Services/MessageServices.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Services/MessageServices.cs index 936e44f70..ca3e51f8e 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Services/MessageServices.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/MessageServices.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.Containerized_eShop.WebMVC.Services +namespace Microsoft.eShopOnContainers.WebMVC.Services { // This class is used by the application to send Email and SMS // when you turn on two-factor authentication in ASP.NET Identity. diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Startup.cs b/src/Web/Microsoft.eShopOnContainers.WebMVC/Startup.cs similarity index 93% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Startup.cs rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Startup.cs index 6435bc4e1..100aace69 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Startup.cs +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Startup.cs @@ -9,11 +9,11 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Containerized_eShop.WebMVC.Data; -using Microsoft.Containerized_eShop.WebMVC.Models; -using Microsoft.Containerized_eShop.WebMVC.Services; +using Microsoft.eShopOnContainers.WebMVC.Data; +using Microsoft.eShopOnContainers.WebMVC.Models; +using Microsoft.eShopOnContainers.WebMVC.Services; -namespace Microsoft.Containerized_eShop.WebMVC +namespace Microsoft.eShopOnContainers.WebMVC { public class Startup { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ConfirmEmail.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ConfirmEmail.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ConfirmEmail.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ExternalLoginFailure.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ExternalLoginFailure.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginFailure.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ForgotPassword.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPassword.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ForgotPassword.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPassword.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Lockout.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Lockout.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Lockout.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Lockout.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Login.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Login.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Login.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Login.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Register.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Register.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/Register.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Register.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ResetPassword.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPassword.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ResetPassword.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPassword.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/SendCode.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/SendCode.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/SendCode.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/SendCode.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/VerifyCode.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/VerifyCode.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Account/VerifyCode.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/VerifyCode.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/About.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/About.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/About.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/About.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/Contact.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Contact.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/Contact.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Contact.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/Index.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Index.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Home/Index.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Index.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/AddPhoneNumber.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/AddPhoneNumber.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/AddPhoneNumber.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/ChangePassword.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ChangePassword.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/ChangePassword.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ChangePassword.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/Index.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/Index.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/Index.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/Index.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/ManageLogins.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ManageLogins.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/ManageLogins.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ManageLogins.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/SetPassword.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/SetPassword.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/SetPassword.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/SetPassword.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/Error.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/Error.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/Error.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/Error.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_Layout.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_Layout.cshtml similarity index 93% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_Layout.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_Layout.cshtml index 435a4a5da..b60bc79b7 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - Microsoft.Containerized_eShop.WebMVC + @ViewData["Title"] - Microsoft.eShopOnContainers.WebMVC @@ -26,7 +26,7 @@ - Microsoft.Containerized_eShop.WebMVC + Microsoft.eShopOnContainers.WebMVC
    @@ -42,7 +42,7 @@ @RenderBody()
    -

    © 2016 - Microsoft.Containerized_eShop.WebMVC

    +

    © 2016 - Microsoft.eShopOnContainers.WebMVC

diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_LoginPartial.cshtml similarity index 94% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_LoginPartial.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_LoginPartial.cshtml index c47e9acc3..22dda4dda 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_LoginPartial.cshtml +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_LoginPartial.cshtml @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Identity -@using Microsoft.Containerized_eShop.WebMVC.Models +@using Microsoft.eShopOnContainers.WebMVC.Models @inject SignInManager SignInManager @inject UserManager UserManager diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewImports.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewImports.cshtml new file mode 100644 index 000000000..476e0dfc5 --- /dev/null +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewImports.cshtml @@ -0,0 +1,6 @@ +@using Microsoft.eShopOnContainers.WebMVC +@using Microsoft.eShopOnContainers.WebMVC.Models +@using Microsoft.eShopOnContainers.WebMVC.Models.AccountViewModels +@using Microsoft.eShopOnContainers.WebMVC.Models.ManageViewModels +@using Microsoft.AspNetCore.Identity +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Views/_ViewStart.cshtml b/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewStart.cshtml similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Views/_ViewStart.cshtml rename to src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewStart.cshtml diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/appsettings.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/appsettings.json similarity index 65% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/appsettings.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/appsettings.json index 5a272260a..5331e545a 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/appsettings.json +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-Microsoft.Containerized_eShop.WebMVC-10bbf6dc-4800-47aa-b85b-f26a9fbde74c;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-Microsoft.eShopOnContainers.WebMVC-946ae052-8305-4a99-965b-ec8636ddbae3;Trusted_Connection=True;MultipleActiveResultSets=true" }, "Logging": { "IncludeScopes": false, diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/bower.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/bower.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/bower.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/bower.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/bundleconfig.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/bundleconfig.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/bundleconfig.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/bundleconfig.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/Microsoft.Containerized-eShop.WebMVC.xproj b/src/Web/Microsoft.eShopOnContainers.WebMVC/eShopOnContainers.WebMVC.xproj similarity index 89% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/Microsoft.Containerized-eShop.WebMVC.xproj rename to src/Web/Microsoft.eShopOnContainers.WebMVC/eShopOnContainers.WebMVC.xproj index 385127d44..fd881f974 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/Microsoft.Containerized-eShop.WebMVC.xproj +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/eShopOnContainers.WebMVC.xproj @@ -6,8 +6,8 @@ - 1d40c583-abf0-400b-8c63-2c3669268c8b - Microsoft.Containerized_eShop.WebMVC + f0333d8e-0b27-42b7-b2c6-78f3657624e2 + Microsoft.eShopOnContainers.WebMVC .\obj .\bin\ v4.6 diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/project.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/project.json similarity index 96% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/project.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/project.json index ceb88bf21..8f00e7d3a 100644 --- a/src/Web/Microsoft.Containerized-eShop.WebMVC/project.json +++ b/src/Web/Microsoft.eShopOnContainers.WebMVC/project.json @@ -1,5 +1,5 @@ { - "userSecretsId": "aspnet-Microsoft.Containerized_eShop.WebMVC-10bbf6dc-4800-47aa-b85b-f26a9fbde74c", + "userSecretsId": "aspnet-Microsoft.eShopOnContainers.WebMVC-946ae052-8305-4a99-965b-ec8636ddbae3", "dependencies": { "Microsoft.NETCore.App": { diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/web.config b/src/Web/Microsoft.eShopOnContainers.WebMVC/web.config similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/web.config rename to src/Web/Microsoft.eShopOnContainers.WebMVC/web.config diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/_references.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/_references.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/_references.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/_references.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/css/site.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/css/site.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/css/site.min.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.min.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/css/site.min.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.min.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/favicon.ico b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/favicon.ico similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/favicon.ico rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/favicon.ico diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner1.svg b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner1.svg similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner1.svg rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner1.svg diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner2.svg b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner2.svg similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner2.svg rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner2.svg diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner3.svg b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner3.svg similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner3.svg rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner3.svg diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner4.svg b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner4.svg similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/images/banner4.svg rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner4.svg diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/js/site.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/js/site.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/js/site.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/js/site.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/.bower.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/.bower.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/.bower.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/LICENSE b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/LICENSE rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/LICENSE diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/.bower.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/.bower.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/.bower.json b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/.bower.json rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/.bower.json diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/LICENSE.txt b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/LICENSE.txt rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map b/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Web/Microsoft.Containerized-eShop.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map