diff --git a/build-docker-images.ps1 b/build-docker-images.ps1 new file mode 100644 index 000000000..ab59275e5 --- /dev/null +++ b/build-docker-images.ps1 @@ -0,0 +1,32 @@ + +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +$pubFolderToDelete = $scriptPath + "\pub" +remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue +#cmd /c "rd /s pub" /q + + +$webPathToJson = $scriptPath + "\src\Web\WebMVC\project.json" +Write-Host "webPathToJson is $webPathToJson" -ForegroundColor Yellow +$webPathToPub = $scriptPath + "\pub\webMVC" +Write-Host "webPathToPub is $webPathToPub" -ForegroundColor Yellow +dotnet publish $webPathToJson -o $webPathToPub + +$catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json" +Write-Host "catalogPathToJson is $catalogPathToJson" -ForegroundColor Yellow +$catalogPathToPub = $scriptPath + "\pub\catalog" +Write-Host "catalogPathToPub is $catalogPathToPub" -ForegroundColor Yellow +dotnet publish $catalogPathToJson -o $catalogPathToPub + +$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" +Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow +$orderingPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow +dotnet publish $orderingPathToJson -o $orderingPathToPub + + +docker build -t eshop/web $webPathToPub +docker build -t eshop/catalog.api $catalogPathToPub +docker build -t eshop/ordering.api $orderingPathToPub \ No newline at end of file diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln index 0109574d6..df38d88fd 100644 --- a/eShopOnContainers.sln +++ b/eShopOnContainers.sln @@ -27,8 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4 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}" @@ -49,16 +47,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console App", "Console App" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopConsole", "src\Console\eShopConsole\eShopConsole.xproj", "{C10C7B69-CE4F-4167-928E-33B7FA1DFFC7}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebMVC", "src\Web\WebMVC\eShopOnContainers.WebMVC.xproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}" +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 @@ -87,6 +83,10 @@ Global {C10C7B69-CE4F-4167-928E-33B7FA1DFFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {C10C7B69-CE4F-4167-928E-33B7FA1DFFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C10C7B69-CE4F-4167-928E-33B7FA1DFFC7}.Release|Any CPU.Build.0 = Release|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -98,7 +98,6 @@ Global {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} @@ -108,5 +107,6 @@ Global {A0AFC432-3846-4B4E-BD8E-3C8C896F4967} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {48FC45C5-223F-4B59-AC77-6CBB1C561E85} = {932D8224-11F6-4D07-B109-DA28AD288A63} {C10C7B69-CE4F-4167-928E-33B7FA1DFFC7} = {48FC45C5-223F-4B59-AC77-6CBB1C561E85} + {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} EndGlobalSection EndGlobal diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Dockerfile b/src/Web/Microsoft.eShopOnContainers.WebMVC/Dockerfile deleted file mode 100644 index 5d638a542..000000000 --- a/src/Web/Microsoft.eShopOnContainers.WebMVC/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM microsoft/dotnet:1.0.0-core -ARG source=. -WORKDIR /app -ENV ASPNETCORE_URLS http://*:80 -EXPOSE 80 -COPY $source . -ENTRYPOINT dotnet Microsoft.eShopOnContainers.WebMVC.dll diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.yml b/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.yml deleted file mode 100644 index 2cf1a7757..000000000 --- a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' - -services: - microsoft.eshoponcontainers.webmvc: - image: user/microsoft.eshoponcontainers.webmvc${TAG} - build: - context: . - dockerfile: Dockerfile - ports: - - "80" diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/.bowerrc b/src/Web/WebMVC/.bowerrc similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/.bowerrc rename to src/Web/WebMVC/.bowerrc diff --git a/src/Web/WebMVC/.dockerignore b/src/Web/WebMVC/.dockerignore new file mode 100644 index 000000000..63d337d41 --- /dev/null +++ b/src/Web/WebMVC/.dockerignore @@ -0,0 +1,2 @@ +docker-compose.yml +Dockerfile diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/AppSettings.cs b/src/Web/WebMVC/AppSettings.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/AppSettings.cs rename to src/Web/WebMVC/AppSettings.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/AccountController.cs rename to src/Web/WebMVC/Controllers/AccountController.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/HomeController.cs b/src/Web/WebMVC/Controllers/HomeController.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/HomeController.cs rename to src/Web/WebMVC/Controllers/HomeController.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/ManageController.cs b/src/Web/WebMVC/Controllers/ManageController.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Controllers/ManageController.cs rename to src/Web/WebMVC/Controllers/ManageController.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/ApplicationDbContext.cs b/src/Web/WebMVC/Data/ApplicationDbContext.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Data/ApplicationDbContext.cs rename to src/Web/WebMVC/Data/ApplicationDbContext.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Web/WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Web/WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Web/WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Web/WebMVC/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Web/WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Web/WebMVC/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile new file mode 100644 index 000000000..db3d9c491 --- /dev/null +++ b/src/Web/WebMVC/Dockerfile @@ -0,0 +1,8 @@ +FROM microsoft/aspnetcore:1.0.1 +ENTRYPOINT ["dotnet", "WebMVC.dll"] +ARG source=. +WORKDIR /app +ENV ASPNETCORE_URLS http://*:80 +EXPOSE 80 +COPY $source . + diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/LoginViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/LoginViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/LoginViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/RegisterViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/RegisterViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/RegisterViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/SendCodeViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/Web/WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs rename to src/Web/WebMVC/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ApplicationUser.cs b/src/Web/WebMVC/Models/ApplicationUser.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ApplicationUser.cs rename to src/Web/WebMVC/Models/ApplicationUser.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/CatalogItem.cs b/src/Web/WebMVC/Models/CatalogItem.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/CatalogItem.cs rename to src/Web/WebMVC/Models/CatalogItem.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/FactorViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/FactorViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/FactorViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/IndexViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/IndexViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/IndexViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/Web/WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to src/Web/WebMVC/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Program.cs b/src/Web/WebMVC/Program.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Program.cs rename to src/Web/WebMVC/Program.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Properties/launchSettings.json b/src/Web/WebMVC/Properties/launchSettings.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Properties/launchSettings.json rename to src/Web/WebMVC/Properties/launchSettings.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/IEmailSender.cs b/src/Web/WebMVC/Services/IEmailSender.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Services/IEmailSender.cs rename to src/Web/WebMVC/Services/IEmailSender.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/ISmsSender.cs b/src/Web/WebMVC/Services/ISmsSender.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Services/ISmsSender.cs rename to src/Web/WebMVC/Services/ISmsSender.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Services/MessageServices.cs b/src/Web/WebMVC/Services/MessageServices.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Services/MessageServices.cs rename to src/Web/WebMVC/Services/MessageServices.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Startup.cs rename to src/Web/WebMVC/Startup.cs diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ConfirmEmail.cshtml b/src/Web/WebMVC/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ConfirmEmail.cshtml rename to src/Web/WebMVC/Views/Account/ConfirmEmail.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml b/src/Web/WebMVC/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginConfirmation.cshtml rename to src/Web/WebMVC/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginFailure.cshtml b/src/Web/WebMVC/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ExternalLoginFailure.cshtml rename to src/Web/WebMVC/Views/Account/ExternalLoginFailure.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPassword.cshtml b/src/Web/WebMVC/Views/Account/ForgotPassword.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPassword.cshtml rename to src/Web/WebMVC/Views/Account/ForgotPassword.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Web/WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml rename to src/Web/WebMVC/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Lockout.cshtml b/src/Web/WebMVC/Views/Account/Lockout.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Lockout.cshtml rename to src/Web/WebMVC/Views/Account/Lockout.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Login.cshtml b/src/Web/WebMVC/Views/Account/Login.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Login.cshtml rename to src/Web/WebMVC/Views/Account/Login.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Register.cshtml b/src/Web/WebMVC/Views/Account/Register.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/Register.cshtml rename to src/Web/WebMVC/Views/Account/Register.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPassword.cshtml b/src/Web/WebMVC/Views/Account/ResetPassword.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPassword.cshtml rename to src/Web/WebMVC/Views/Account/ResetPassword.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml b/src/Web/WebMVC/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/ResetPasswordConfirmation.cshtml rename to src/Web/WebMVC/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/SendCode.cshtml b/src/Web/WebMVC/Views/Account/SendCode.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/SendCode.cshtml rename to src/Web/WebMVC/Views/Account/SendCode.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/VerifyCode.cshtml b/src/Web/WebMVC/Views/Account/VerifyCode.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Account/VerifyCode.cshtml rename to src/Web/WebMVC/Views/Account/VerifyCode.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/About.cshtml b/src/Web/WebMVC/Views/Home/About.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/About.cshtml rename to src/Web/WebMVC/Views/Home/About.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Contact.cshtml b/src/Web/WebMVC/Views/Home/Contact.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Contact.cshtml rename to src/Web/WebMVC/Views/Home/Contact.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Index.cshtml b/src/Web/WebMVC/Views/Home/Index.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Home/Index.cshtml rename to src/Web/WebMVC/Views/Home/Index.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/AddPhoneNumber.cshtml b/src/Web/WebMVC/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/AddPhoneNumber.cshtml rename to src/Web/WebMVC/Views/Manage/AddPhoneNumber.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ChangePassword.cshtml b/src/Web/WebMVC/Views/Manage/ChangePassword.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ChangePassword.cshtml rename to src/Web/WebMVC/Views/Manage/ChangePassword.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/Index.cshtml b/src/Web/WebMVC/Views/Manage/Index.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/Index.cshtml rename to src/Web/WebMVC/Views/Manage/Index.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ManageLogins.cshtml b/src/Web/WebMVC/Views/Manage/ManageLogins.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/ManageLogins.cshtml rename to src/Web/WebMVC/Views/Manage/ManageLogins.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/SetPassword.cshtml b/src/Web/WebMVC/Views/Manage/SetPassword.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/SetPassword.cshtml rename to src/Web/WebMVC/Views/Manage/SetPassword.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml b/src/Web/WebMVC/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Manage/VerifyPhoneNumber.cshtml rename to src/Web/WebMVC/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/Error.cshtml b/src/Web/WebMVC/Views/Shared/Error.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/Error.cshtml rename to src/Web/WebMVC/Views/Shared/Error.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_Layout.cshtml rename to src/Web/WebMVC/Views/Shared/_Layout.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_LoginPartial.cshtml rename to src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Web/WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Web/WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewImports.cshtml b/src/Web/WebMVC/Views/_ViewImports.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewImports.cshtml rename to src/Web/WebMVC/Views/_ViewImports.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewStart.cshtml b/src/Web/WebMVC/Views/_ViewStart.cshtml similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/Views/_ViewStart.cshtml rename to src/Web/WebMVC/Views/_ViewStart.cshtml diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/appsettings.json rename to src/Web/WebMVC/appsettings.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/bower.json b/src/Web/WebMVC/bower.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/bower.json rename to src/Web/WebMVC/bower.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/bundleconfig.json b/src/Web/WebMVC/bundleconfig.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/bundleconfig.json rename to src/Web/WebMVC/bundleconfig.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.debug.yml b/src/Web/WebMVC/docker-compose.dev.debug.yml similarity index 91% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.debug.yml rename to src/Web/WebMVC/docker-compose.dev.debug.yml index 5fe72ffab..85e1b082c 100644 --- a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.debug.yml +++ b/src/Web/WebMVC/docker-compose.dev.debug.yml @@ -1,7 +1,7 @@ version: '2' services: - microsoft.eshoponcontainers.webmvc: + webmvc: build: args: source: obj/Docker/empty/ diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.release.yml b/src/Web/WebMVC/docker-compose.dev.release.yml similarity index 82% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.release.yml rename to src/Web/WebMVC/docker-compose.dev.release.yml index 3e58c13eb..901845620 100644 --- a/src/Web/Microsoft.eShopOnContainers.WebMVC/docker-compose.dev.release.yml +++ b/src/Web/WebMVC/docker-compose.dev.release.yml @@ -1,7 +1,7 @@ version: '2' services: - microsoft.eshoponcontainers.webmvc: + webmvc: labels: - "com.microsoft.visualstudio.targetoperatingsystem=linux" volumes: diff --git a/src/Web/WebMVC/docker-compose.yml b/src/Web/WebMVC/docker-compose.yml new file mode 100644 index 000000000..8cb3c34ea --- /dev/null +++ b/src/Web/WebMVC/docker-compose.yml @@ -0,0 +1,42 @@ +version: '2' + +services: + webmvc: + image: eshop/web${TAG} + build: + context: . + dockerfile: Dockerfile + environment: + - CatalogUrl=http://catalog.api + ports: + - "80:80" + depends_on: + - catalog.api + + catalog.api: + image: eshop/catalog.api + environment: + - ConnectionString=Server=catalogdata;Port=5432;Database=postgres;username=postgres + expose: + - "80" + depends_on: + - catalogdata + + catalogdata: + image: glennc/eshopdata + + ordering.api: + image: eshop/ordering.api + environment: + - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word + ports: + - "81:80" + extra_hosts: + - "CESARDLBOOKVHD:10.0.75.1" + depends_on: + - ordering.data + + ordering.data: + image: eshop/ordering.data.sqlserver.linux + ports: + - "1433:1433" \ No newline at end of file diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/eShopOnContainers.WebMVC.xproj b/src/Web/WebMVC/eShopOnContainers.WebMVC.xproj similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/eShopOnContainers.WebMVC.xproj rename to src/Web/WebMVC/eShopOnContainers.WebMVC.xproj diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/project.json b/src/Web/WebMVC/project.json similarity index 93% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/project.json rename to src/Web/WebMVC/project.json index ad7b4b88a..e42641eca 100644 --- a/src/Web/Microsoft.eShopOnContainers.WebMVC/project.json +++ b/src/Web/WebMVC/project.json @@ -77,7 +77,9 @@ "Areas/**/Views", "appsettings.json", "web.config", - "Dockerfile" + "Dockerfile", + "docker-compose.yml", + ".dockerignore" ] }, "scripts": { @@ -86,7 +88,6 @@ "dotnet bundle" ], "postpublish": [ - //"dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] + /*"dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"*/] } } \ No newline at end of file diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/web.config b/src/Web/WebMVC/web.config similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/web.config rename to src/Web/WebMVC/web.config diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/_references.js b/src/Web/WebMVC/wwwroot/_references.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/_references.js rename to src/Web/WebMVC/wwwroot/_references.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.css b/src/Web/WebMVC/wwwroot/css/site.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.css rename to src/Web/WebMVC/wwwroot/css/site.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.min.css b/src/Web/WebMVC/wwwroot/css/site.min.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/css/site.min.css rename to src/Web/WebMVC/wwwroot/css/site.min.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/favicon.ico b/src/Web/WebMVC/wwwroot/favicon.ico similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/favicon.ico rename to src/Web/WebMVC/wwwroot/favicon.ico diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner1.svg b/src/Web/WebMVC/wwwroot/images/banner1.svg similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner1.svg rename to src/Web/WebMVC/wwwroot/images/banner1.svg diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner2.svg b/src/Web/WebMVC/wwwroot/images/banner2.svg similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner2.svg rename to src/Web/WebMVC/wwwroot/images/banner2.svg diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner3.svg b/src/Web/WebMVC/wwwroot/images/banner3.svg similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner3.svg rename to src/Web/WebMVC/wwwroot/images/banner3.svg diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner4.svg b/src/Web/WebMVC/wwwroot/images/banner4.svg similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/images/banner4.svg rename to src/Web/WebMVC/wwwroot/images/banner4.svg diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.js b/src/Web/WebMVC/wwwroot/js/site.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.js rename to src/Web/WebMVC/wwwroot/js/site.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.min.js b/src/Web/WebMVC/wwwroot/js/site.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/js/site.min.js rename to src/Web/WebMVC/wwwroot/js/site.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/.bower.json b/src/Web/WebMVC/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/.bower.json rename to src/Web/WebMVC/wwwroot/lib/bootstrap/.bower.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/LICENSE b/src/Web/WebMVC/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/LICENSE rename to src/Web/WebMVC/wwwroot/lib/bootstrap/LICENSE diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Web/WebMVC/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/.bower.json b/src/Web/WebMVC/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/.bower.json rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md b/src/Web/WebMVC/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to src/Web/WebMVC/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/.bower.json b/src/Web/WebMVC/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/.bower.json rename to src/Web/WebMVC/wwwroot/lib/jquery/.bower.json diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/LICENSE.txt b/src/Web/WebMVC/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/LICENSE.txt rename to src/Web/WebMVC/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.js b/src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.js rename to src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js b/src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.js rename to src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map b/src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Web/Microsoft.eShopOnContainers.WebMVC/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Web/WebMVC/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/src/Web/Xamarin projects when created.txt b/src/Web/Xamarin projects when created.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/testpath.ps1 b/testpath.ps1 new file mode 100644 index 000000000..20234e4fe --- /dev/null +++ b/testpath.ps1 @@ -0,0 +1,5 @@ +#$scriptPath = [System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition) + +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" \ No newline at end of file