diff --git a/.gitignore b/.gitignore index b35de17e37..4a7f90ae76 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,3 @@ node_modules/ # vscode python env files .env -/playground/eShopLite/.gitignore -/playground/eShopLite/azure.yaml -/playground/eShopLite/next-steps.md diff --git a/Aspire.sln b/Aspire.sln index b84bf8036f..9b8e828ed4 100644 --- a/Aspire.sln +++ b/Aspire.sln @@ -4,19 +4,19 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting", "src\Aspire.Hosting\Aspire.Hosting.csproj", "{B52DCF1A-465D-4E92-A68A-0EE1A9ED49DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyFrontend", "playground\eShopLite\MyFrontend\MyFrontend.csproj", "{E958BE04-81C2-434C-9E6C-CA145A2B8218}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyFrontend", "playground\TestShop\MyFrontend\MyFrontend.csproj", "{E958BE04-81C2-434C-9E6C-CA145A2B8218}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppHost", "playground\eShopLite\AppHost\AppHost.csproj", "{C1D595AD-FFFD-4E52-AAF6-8DD8C4BD67F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppHost", "playground\TestShop\AppHost\AppHost.csproj", "{C1D595AD-FFFD-4E52-AAF6-8DD8C4BD67F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playground", "playground", "{D173887B-AF42-4576-B9C1-96B9E9B3D9C0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceDefaults", "playground\eShopLite\ServiceDefaults\ServiceDefaults.csproj", "{C7B2309C-073A-4552-A508-A69768B64C6F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceDefaults", "playground\TestShop\ServiceDefaults\ServiceDefaults.csproj", "{C7B2309C-073A-4552-A508-A69768B64C6F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogService", "playground\eShopLite\CatalogService\CatalogService.csproj", "{6D04BB34-1CC6-4FF3-A02A-1FFAC2A7A4F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogService", "playground\TestShop\CatalogService\CatalogService.csproj", "{6D04BB34-1CC6-4FF3-A02A-1FFAC2A7A4F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasketService", "playground\eShopLite\BasketService\BasketService.csproj", "{3FC74EA6-D554-4A87-AED5-A08FE407BBF4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasketService", "playground\TestShop\BasketService\BasketService.csproj", "{3FC74EA6-D554-4A87-AED5-A08FE407BBF4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiGateway", "playground\eShopLite\ApiGateway\ApiGateway.csproj", "{934625C7-243F-4659-9421-515301CF0263}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiGateway", "playground\TestShop\ApiGateway\ApiGateway.csproj", "{934625C7-243F-4659-9421-515301CF0263}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.StackExchange.Redis", "src\Components\Aspire.StackExchange.Redis\Aspire.StackExchange.Redis.csproj", "{7D4A7A84-B297-4777-9E2A-D8B1C427CAC7}" EndProject @@ -40,7 +40,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Npgsql.EntityFramewo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Azure.Messaging.ServiceBus", "src\Components\Aspire.Azure.Messaging.ServiceBus\Aspire.Azure.Messaging.ServiceBus.csproj", "{CC9CD371-9909-4101-83F1-22C7C2617DE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrderProcessor", "playground\eShopLite\OrderProcessor\OrderProcessor.csproj", "{955EDC6D-11A3-4408-9C00-7BFE140AD597}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrderProcessor", "playground\TestShop\OrderProcessor\OrderProcessor.csproj", "{955EDC6D-11A3-4408-9C00-7BFE140AD597}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Npgsql.EntityFrameworkCore.PostgreSQL", "src\Components\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj", "{0F505BE9-42FE-49EC-93CC-57584C4C9671}" EndProject @@ -130,7 +130,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Dapr", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Azure.Provisioning", "src\Aspire.Hosting.Azure.Provisioning\Aspire.Hosting.Azure.Provisioning.csproj", "{D4BD974F-6505-43FC-A94E-2019F0DB5D5D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eShopLite", "eShopLite", "{A68BA1A5-1604-433D-9778-DC0199831C2A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestShop", "TestShop", "{A68BA1A5-1604-433D-9778-DC0199831C2A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Microsoft.Azure.Cosmos", "src\Components\Aspire.Microsoft.Azure.Cosmos\Aspire.Microsoft.Azure.Cosmos.csproj", "{23298562-C1D4-41CD-83FE-426C94FEE35F}" EndProject @@ -140,7 +140,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Microsoft.Azure.Cosm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Microsoft.EntityFrameworkCore.Cosmos.Tests", "tests\Aspire.Microsoft.EntityFrameworkCore.Cosmos.Tests\Aspire.Microsoft.EntityFrameworkCore.Cosmos.Tests.csproj", "{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogDb", "playground\eShopLite\CatalogDb\CatalogDb.csproj", "{A84C4EE3-2601-4804-BCDC-E9948E164A22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogDb", "playground\TestShop\CatalogDb\CatalogDb.csproj", "{A84C4EE3-2601-4804-BCDC-E9948E164A22}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{991DB378-6CB5-4441-BFC3-657400690FC3}" ProjectSection(SolutionItems) = preProject @@ -217,7 +217,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mongo.AppHost", "playground EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mongo.ApiService", "playground\mongo\Mongo.ApiService\Mongo.ApiService.csproj", "{40EC38A2-69DB-4759-81C8-13F31090FEA6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogModel", "playground\eShopLite\CatalogModel\CatalogModel.csproj", "{83267206-9438-42CD-860C-C92E7DBAA4C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogModel", "playground\TestShop\CatalogModel\CatalogModel.csproj", "{83267206-9438-42CD-860C-C92E7DBAA4C3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.EndToEnd.Tests", "tests\Aspire.EndToEnd.Tests\Aspire.EndToEnd.Tests.csproj", "{C1483B79-4FE9-47FF-B544-EB5DBB7A0A3E}" EndProject @@ -232,6 +232,7 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PostgresEndToEnd.AppHost", "playground\PostgresEndToEnd\PostgresEndToEnd.AppHost\PostgresEndToEnd.AppHost.csproj", "{A4C06329-56EA-4AE6-A698-D2B7B7ABE318}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PostgresEndToEnd.ApiService", "playground\PostgresEndToEnd\PostgresEndToEnd.ApiService\PostgresEndToEnd.ApiService.csproj", "{B7BC1137-25E2-4B5D-A45F-38F5BA4811A2}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mysql", "mysql", "{621991F1-854A-4743-835B-10CAF11A0CFF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySqlDb.AppHost", "Playground\mysql\MySqlDb.AppHost\MySqlDb.AppHost.csproj", "{7E2AD00B-60E0-46C2-8640-7217D678F312}" diff --git a/README.md b/README.md index e654b7d792..94f8382f55 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,11 @@ [Tooling](https://learn.microsoft.com/dotnet/aspire/get-started/aspire-overview?#project-templates-and-tooling): .NET Aspire comes with project templates and tooling experiences for Visual Studio and the dotnet CLI which help you create and interact with .NET Aspire apps. -To learn more, read the full [.NET Aspire overview and documentation](https://learn.microsoft.com/dotnet/aspire/). Samples are available in the [.NET Aspire samples repository](https://github.com/dotnet/aspire-samples). +To learn more, read the full [.NET Aspire overview and documentation](https://learn.microsoft.com/dotnet/aspire/). Samples are available in the [.NET Aspire samples repository](https://github.com/dotnet/aspire-samples). You can find the eShop sample [here](https://github.com/dotnet/eshop) and the Azure version [here](https://github.com/Azure-Samples/eShopOnAzure). ## What is in this repo? -The .NET Aspire application host, dashboard, service discovery infrastructure, and all .NET Aspire components. It also contains the project templates and a simple sample, 'eShopLite'. - -You can find the full version of the eShop sample [here](https://github.com/dotnet/eshop) and the Azure version [here](https://github.com/Azure-Samples/eShopOnAzure). +The .NET Aspire application host, dashboard, service discovery infrastructure, and all .NET Aspire components. It also contains the project templates. ## Using latest daily builds diff --git a/docs/contributing.md b/docs/contributing.md index ec88e2608c..13a17ad862 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -9,20 +9,20 @@ See [machine-requirements.md](machine-requirements.md). ## Build the repo `.\build.cmd` (Windows) or `.\build.sh` (macOS and Linux) -## Run eShopLite +## Run TestShop This will confirm that you're all set up. If you are using Visual Studio: 1. Open `Aspire.sln` -1. Set the Startup Project to be the `AppHost` project (it's under `\samples\eShopLite`). Make sure the launch profile is set to "http". +1. Set the Startup Project to be the `AppHost` project (it's under `\playground\TestShop`). Make sure the launch profile is set to "http". 1. F5 to debug, or Ctrl+F5 to launch without debugging. Otherwise: ```shell -dotnet restore samples/eShopLite/AppHost/AppHost.csproj -dotnet run --project samples/eShopLite/AppHost/AppHost.csproj +dotnet restore playground/TestShop/AppHost/AppHost.csproj +dotnet run --project playground/TestShop/AppHost/AppHost.csproj ``` ## View Dashboard diff --git a/docs/tips-and-known-issues.md b/docs/tips-and-known-issues.md index 4b8e2f5197..eb9b1dd4b1 100644 --- a/docs/tips-and-known-issues.md +++ b/docs/tips-and-known-issues.md @@ -6,7 +6,7 @@ We have seen Docker get into weird state on "DevBox" machines that get hibernate The remedy is to do "Restart Docker" gesture from the Docker icon in system tray. -## If something goes wrong and you are left with a bunch of .NET Aspire eShopLite orphaned processes and containers +## If something goes wrong and you are left with a bunch of .NET Aspire TestShop orphaned processes and containers This will display process IDs of all the .NET Aspire shopping running processes diff --git a/playground/eShopLite/ApiGateway/ApiGateway.csproj b/playground/TestShop/ApiGateway/ApiGateway.csproj similarity index 100% rename from playground/eShopLite/ApiGateway/ApiGateway.csproj rename to playground/TestShop/ApiGateway/ApiGateway.csproj diff --git a/playground/eShopLite/ApiGateway/Program.cs b/playground/TestShop/ApiGateway/Program.cs similarity index 100% rename from playground/eShopLite/ApiGateway/Program.cs rename to playground/TestShop/ApiGateway/Program.cs diff --git a/playground/eShopLite/ApiGateway/Properties/launchSettings.json b/playground/TestShop/ApiGateway/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/ApiGateway/Properties/launchSettings.json rename to playground/TestShop/ApiGateway/Properties/launchSettings.json diff --git a/playground/eShopLite/ApiGateway/appsettings.Development.json b/playground/TestShop/ApiGateway/appsettings.Development.json similarity index 100% rename from playground/eShopLite/ApiGateway/appsettings.Development.json rename to playground/TestShop/ApiGateway/appsettings.Development.json diff --git a/playground/eShopLite/ApiGateway/appsettings.json b/playground/TestShop/ApiGateway/appsettings.json similarity index 100% rename from playground/eShopLite/ApiGateway/appsettings.json rename to playground/TestShop/ApiGateway/appsettings.json diff --git a/playground/eShopLite/AppHost/AppHost.csproj b/playground/TestShop/AppHost/AppHost.csproj similarity index 96% rename from playground/eShopLite/AppHost/AppHost.csproj rename to playground/TestShop/AppHost/AppHost.csproj index 61f0f16f0f..b049291011 100644 --- a/playground/eShopLite/AppHost/AppHost.csproj +++ b/playground/TestShop/AppHost/AppHost.csproj @@ -6,7 +6,7 @@ 1bf0740a-0dfc-45aa-9002-def9b2b17da0 enable true - eShopLite.AppHost + TestShop.AppHost diff --git a/playground/eShopLite/AppHost/Directory.Build.props b/playground/TestShop/AppHost/Directory.Build.props similarity index 100% rename from playground/eShopLite/AppHost/Directory.Build.props rename to playground/TestShop/AppHost/Directory.Build.props diff --git a/playground/eShopLite/AppHost/Directory.Build.targets b/playground/TestShop/AppHost/Directory.Build.targets similarity index 100% rename from playground/eShopLite/AppHost/Directory.Build.targets rename to playground/TestShop/AppHost/Directory.Build.targets diff --git a/playground/eShopLite/AppHost/Program.cs b/playground/TestShop/AppHost/Program.cs similarity index 100% rename from playground/eShopLite/AppHost/Program.cs rename to playground/TestShop/AppHost/Program.cs diff --git a/playground/eShopLite/AppHost/Properties/launchSettings.json b/playground/TestShop/AppHost/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/AppHost/Properties/launchSettings.json rename to playground/TestShop/AppHost/Properties/launchSettings.json diff --git a/playground/eShopLite/AppHost/appsettings.json b/playground/TestShop/AppHost/appsettings.json similarity index 100% rename from playground/eShopLite/AppHost/appsettings.json rename to playground/TestShop/AppHost/appsettings.json diff --git a/playground/eShopLite/AppHost/aspire-manifest.json b/playground/TestShop/AppHost/aspire-manifest.json similarity index 100% rename from playground/eShopLite/AppHost/aspire-manifest.json rename to playground/TestShop/AppHost/aspire-manifest.json diff --git a/playground/eShopLite/BasketService/BasketService.cs b/playground/TestShop/BasketService/BasketService.cs similarity index 100% rename from playground/eShopLite/BasketService/BasketService.cs rename to playground/TestShop/BasketService/BasketService.cs diff --git a/playground/eShopLite/BasketService/BasketService.csproj b/playground/TestShop/BasketService/BasketService.csproj similarity index 100% rename from playground/eShopLite/BasketService/BasketService.csproj rename to playground/TestShop/BasketService/BasketService.csproj diff --git a/playground/eShopLite/BasketService/Models/BasketItem.cs b/playground/TestShop/BasketService/Models/BasketItem.cs similarity index 100% rename from playground/eShopLite/BasketService/Models/BasketItem.cs rename to playground/TestShop/BasketService/Models/BasketItem.cs diff --git a/playground/eShopLite/BasketService/Models/CustomerBasket.cs b/playground/TestShop/BasketService/Models/CustomerBasket.cs similarity index 100% rename from playground/eShopLite/BasketService/Models/CustomerBasket.cs rename to playground/TestShop/BasketService/Models/CustomerBasket.cs diff --git a/playground/eShopLite/BasketService/Models/DecimalValue.cs b/playground/TestShop/BasketService/Models/DecimalValue.cs similarity index 100% rename from playground/eShopLite/BasketService/Models/DecimalValue.cs rename to playground/TestShop/BasketService/Models/DecimalValue.cs diff --git a/playground/eShopLite/BasketService/Models/Order.cs b/playground/TestShop/BasketService/Models/Order.cs similarity index 100% rename from playground/eShopLite/BasketService/Models/Order.cs rename to playground/TestShop/BasketService/Models/Order.cs diff --git a/playground/eShopLite/BasketService/Program.cs b/playground/TestShop/BasketService/Program.cs similarity index 100% rename from playground/eShopLite/BasketService/Program.cs rename to playground/TestShop/BasketService/Program.cs diff --git a/playground/eShopLite/BasketService/Properties/launchSettings.json b/playground/TestShop/BasketService/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/BasketService/Properties/launchSettings.json rename to playground/TestShop/BasketService/Properties/launchSettings.json diff --git a/playground/eShopLite/BasketService/Protos/basket.proto b/playground/TestShop/BasketService/Protos/basket.proto similarity index 100% rename from playground/eShopLite/BasketService/Protos/basket.proto rename to playground/TestShop/BasketService/Protos/basket.proto diff --git a/playground/eShopLite/BasketService/Repositories/IBasketRepository.cs b/playground/TestShop/BasketService/Repositories/IBasketRepository.cs similarity index 100% rename from playground/eShopLite/BasketService/Repositories/IBasketRepository.cs rename to playground/TestShop/BasketService/Repositories/IBasketRepository.cs diff --git a/playground/eShopLite/BasketService/Repositories/RedisBasketRepository.cs b/playground/TestShop/BasketService/Repositories/RedisBasketRepository.cs similarity index 100% rename from playground/eShopLite/BasketService/Repositories/RedisBasketRepository.cs rename to playground/TestShop/BasketService/Repositories/RedisBasketRepository.cs diff --git a/playground/eShopLite/BasketService/appsettings.Development.json b/playground/TestShop/BasketService/appsettings.Development.json similarity index 100% rename from playground/eShopLite/BasketService/appsettings.Development.json rename to playground/TestShop/BasketService/appsettings.Development.json diff --git a/playground/eShopLite/BasketService/appsettings.json b/playground/TestShop/BasketService/appsettings.json similarity index 100% rename from playground/eShopLite/BasketService/appsettings.json rename to playground/TestShop/BasketService/appsettings.json diff --git a/playground/eShopLite/CatalogDb/CatalogDb.csproj b/playground/TestShop/CatalogDb/CatalogDb.csproj similarity index 100% rename from playground/eShopLite/CatalogDb/CatalogDb.csproj rename to playground/TestShop/CatalogDb/CatalogDb.csproj diff --git a/playground/eShopLite/CatalogDb/CatalogDbInitializer.cs b/playground/TestShop/CatalogDb/CatalogDbInitializer.cs similarity index 100% rename from playground/eShopLite/CatalogDb/CatalogDbInitializer.cs rename to playground/TestShop/CatalogDb/CatalogDbInitializer.cs diff --git a/playground/eShopLite/CatalogDb/CatalogDbInitializerHealthCheck.cs b/playground/TestShop/CatalogDb/CatalogDbInitializerHealthCheck.cs similarity index 100% rename from playground/eShopLite/CatalogDb/CatalogDbInitializerHealthCheck.cs rename to playground/TestShop/CatalogDb/CatalogDbInitializerHealthCheck.cs diff --git a/playground/eShopLite/CatalogDb/Migrations/20230517065317_Initial.Designer.cs b/playground/TestShop/CatalogDb/Migrations/20230517065317_Initial.Designer.cs similarity index 100% rename from playground/eShopLite/CatalogDb/Migrations/20230517065317_Initial.Designer.cs rename to playground/TestShop/CatalogDb/Migrations/20230517065317_Initial.Designer.cs diff --git a/playground/eShopLite/CatalogDb/Migrations/20230517065317_Initial.cs b/playground/TestShop/CatalogDb/Migrations/20230517065317_Initial.cs similarity index 100% rename from playground/eShopLite/CatalogDb/Migrations/20230517065317_Initial.cs rename to playground/TestShop/CatalogDb/Migrations/20230517065317_Initial.cs diff --git a/playground/eShopLite/CatalogDb/Migrations/CatalogDbContextModelSnapshot.cs b/playground/TestShop/CatalogDb/Migrations/CatalogDbContextModelSnapshot.cs similarity index 100% rename from playground/eShopLite/CatalogDb/Migrations/CatalogDbContextModelSnapshot.cs rename to playground/TestShop/CatalogDb/Migrations/CatalogDbContextModelSnapshot.cs diff --git a/playground/eShopLite/CatalogDb/Model.cs b/playground/TestShop/CatalogDb/Model.cs similarity index 100% rename from playground/eShopLite/CatalogDb/Model.cs rename to playground/TestShop/CatalogDb/Model.cs diff --git a/playground/eShopLite/CatalogDb/Program.cs b/playground/TestShop/CatalogDb/Program.cs similarity index 100% rename from playground/eShopLite/CatalogDb/Program.cs rename to playground/TestShop/CatalogDb/Program.cs diff --git a/playground/eShopLite/CatalogDb/Properties/launchSettings.json b/playground/TestShop/CatalogDb/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/CatalogDb/Properties/launchSettings.json rename to playground/TestShop/CatalogDb/Properties/launchSettings.json diff --git a/playground/eShopLite/CatalogDb/appsettings.Development.json b/playground/TestShop/CatalogDb/appsettings.Development.json similarity index 100% rename from playground/eShopLite/CatalogDb/appsettings.Development.json rename to playground/TestShop/CatalogDb/appsettings.Development.json diff --git a/playground/eShopLite/CatalogDb/appsettings.json b/playground/TestShop/CatalogDb/appsettings.json similarity index 100% rename from playground/eShopLite/CatalogDb/appsettings.json rename to playground/TestShop/CatalogDb/appsettings.json diff --git a/playground/eShopLite/CatalogModel/CatalogModel.csproj b/playground/TestShop/CatalogModel/CatalogModel.csproj similarity index 100% rename from playground/eShopLite/CatalogModel/CatalogModel.csproj rename to playground/TestShop/CatalogModel/CatalogModel.csproj diff --git a/playground/eShopLite/CatalogModel/Model.cs b/playground/TestShop/CatalogModel/Model.cs similarity index 100% rename from playground/eShopLite/CatalogModel/Model.cs rename to playground/TestShop/CatalogModel/Model.cs diff --git a/playground/eShopLite/CatalogService/CatalogApi.cs b/playground/TestShop/CatalogService/CatalogApi.cs similarity index 100% rename from playground/eShopLite/CatalogService/CatalogApi.cs rename to playground/TestShop/CatalogService/CatalogApi.cs diff --git a/playground/eShopLite/CatalogService/CatalogService.csproj b/playground/TestShop/CatalogService/CatalogService.csproj similarity index 100% rename from playground/eShopLite/CatalogService/CatalogService.csproj rename to playground/TestShop/CatalogService/CatalogService.csproj diff --git a/playground/eShopLite/CatalogService/CatalogService.http b/playground/TestShop/CatalogService/CatalogService.http similarity index 100% rename from playground/eShopLite/CatalogService/CatalogService.http rename to playground/TestShop/CatalogService/CatalogService.http diff --git a/playground/eShopLite/CatalogService/Images/1.png b/playground/TestShop/CatalogService/Images/1.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/1.png rename to playground/TestShop/CatalogService/Images/1.png diff --git a/playground/eShopLite/CatalogService/Images/10.png b/playground/TestShop/CatalogService/Images/10.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/10.png rename to playground/TestShop/CatalogService/Images/10.png diff --git a/playground/eShopLite/CatalogService/Images/11.png b/playground/TestShop/CatalogService/Images/11.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/11.png rename to playground/TestShop/CatalogService/Images/11.png diff --git a/playground/eShopLite/CatalogService/Images/12.png b/playground/TestShop/CatalogService/Images/12.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/12.png rename to playground/TestShop/CatalogService/Images/12.png diff --git a/playground/eShopLite/CatalogService/Images/13.png b/playground/TestShop/CatalogService/Images/13.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/13.png rename to playground/TestShop/CatalogService/Images/13.png diff --git a/playground/eShopLite/CatalogService/Images/14.png b/playground/TestShop/CatalogService/Images/14.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/14.png rename to playground/TestShop/CatalogService/Images/14.png diff --git a/playground/eShopLite/CatalogService/Images/2.png b/playground/TestShop/CatalogService/Images/2.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/2.png rename to playground/TestShop/CatalogService/Images/2.png diff --git a/playground/eShopLite/CatalogService/Images/3.png b/playground/TestShop/CatalogService/Images/3.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/3.png rename to playground/TestShop/CatalogService/Images/3.png diff --git a/playground/eShopLite/CatalogService/Images/4.png b/playground/TestShop/CatalogService/Images/4.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/4.png rename to playground/TestShop/CatalogService/Images/4.png diff --git a/playground/eShopLite/CatalogService/Images/5.png b/playground/TestShop/CatalogService/Images/5.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/5.png rename to playground/TestShop/CatalogService/Images/5.png diff --git a/playground/eShopLite/CatalogService/Images/6.png b/playground/TestShop/CatalogService/Images/6.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/6.png rename to playground/TestShop/CatalogService/Images/6.png diff --git a/playground/eShopLite/CatalogService/Images/7.png b/playground/TestShop/CatalogService/Images/7.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/7.png rename to playground/TestShop/CatalogService/Images/7.png diff --git a/playground/eShopLite/CatalogService/Images/8.png b/playground/TestShop/CatalogService/Images/8.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/8.png rename to playground/TestShop/CatalogService/Images/8.png diff --git a/playground/eShopLite/CatalogService/Images/9.png b/playground/TestShop/CatalogService/Images/9.png similarity index 100% rename from playground/eShopLite/CatalogService/Images/9.png rename to playground/TestShop/CatalogService/Images/9.png diff --git a/playground/eShopLite/CatalogService/Program.cs b/playground/TestShop/CatalogService/Program.cs similarity index 100% rename from playground/eShopLite/CatalogService/Program.cs rename to playground/TestShop/CatalogService/Program.cs diff --git a/playground/eShopLite/CatalogService/Properties/launchSettings.json b/playground/TestShop/CatalogService/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/CatalogService/Properties/launchSettings.json rename to playground/TestShop/CatalogService/Properties/launchSettings.json diff --git a/playground/eShopLite/CatalogService/appsettings.Development.json b/playground/TestShop/CatalogService/appsettings.Development.json similarity index 100% rename from playground/eShopLite/CatalogService/appsettings.Development.json rename to playground/TestShop/CatalogService/appsettings.Development.json diff --git a/playground/eShopLite/CatalogService/appsettings.json b/playground/TestShop/CatalogService/appsettings.json similarity index 100% rename from playground/eShopLite/CatalogService/appsettings.json rename to playground/TestShop/CatalogService/appsettings.json diff --git a/playground/eShopLite/MyFrontend/Components/AddToCart.razor b/playground/TestShop/MyFrontend/Components/AddToCart.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/AddToCart.razor rename to playground/TestShop/MyFrontend/Components/AddToCart.razor diff --git a/playground/eShopLite/MyFrontend/Components/App.razor b/playground/TestShop/MyFrontend/Components/App.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/App.razor rename to playground/TestShop/MyFrontend/Components/App.razor diff --git a/playground/eShopLite/MyFrontend/Components/Cart.razor b/playground/TestShop/MyFrontend/Components/Cart.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Cart.razor rename to playground/TestShop/MyFrontend/Components/Cart.razor diff --git a/playground/eShopLite/MyFrontend/Components/Layout/AppFooter.razor b/playground/TestShop/MyFrontend/Components/Layout/AppFooter.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Layout/AppFooter.razor rename to playground/TestShop/MyFrontend/Components/Layout/AppFooter.razor diff --git a/playground/eShopLite/MyFrontend/Components/Layout/MainLayout.razor b/playground/TestShop/MyFrontend/Components/Layout/MainLayout.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Layout/MainLayout.razor rename to playground/TestShop/MyFrontend/Components/Layout/MainLayout.razor diff --git a/playground/eShopLite/MyFrontend/Components/Layout/MainLayout.razor.css b/playground/TestShop/MyFrontend/Components/Layout/MainLayout.razor.css similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Layout/MainLayout.razor.css rename to playground/TestShop/MyFrontend/Components/Layout/MainLayout.razor.css diff --git a/playground/eShopLite/MyFrontend/Components/NavigationManagerExtensions.cs b/playground/TestShop/MyFrontend/Components/NavigationManagerExtensions.cs similarity index 100% rename from playground/eShopLite/MyFrontend/Components/NavigationManagerExtensions.cs rename to playground/TestShop/MyFrontend/Components/NavigationManagerExtensions.cs diff --git a/playground/eShopLite/MyFrontend/Components/Pages/Error.razor b/playground/TestShop/MyFrontend/Components/Pages/Error.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Pages/Error.razor rename to playground/TestShop/MyFrontend/Components/Pages/Error.razor diff --git a/playground/eShopLite/MyFrontend/Components/Pages/Home.razor b/playground/TestShop/MyFrontend/Components/Pages/Home.razor similarity index 96% rename from playground/eShopLite/MyFrontend/Components/Pages/Home.razor rename to playground/TestShop/MyFrontend/Components/Pages/Home.razor index b773dd8074..7b4fbb3bd2 100644 --- a/playground/eShopLite/MyFrontend/Components/Pages/Home.razor +++ b/playground/TestShop/MyFrontend/Components/Pages/Home.razor @@ -3,10 +3,10 @@ @inject CatalogServiceClient CatalogService -eShopLite Product Catalog +TestShop Product Catalog
-

<eShopLite />

+

<TestShop />

Product Catalog

diff --git a/playground/eShopLite/MyFrontend/Components/Pages/Home.razor.css b/playground/TestShop/MyFrontend/Components/Pages/Home.razor.css similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Pages/Home.razor.css rename to playground/TestShop/MyFrontend/Components/Pages/Home.razor.css diff --git a/playground/eShopLite/MyFrontend/Components/Routes.razor b/playground/TestShop/MyFrontend/Components/Routes.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/Routes.razor rename to playground/TestShop/MyFrontend/Components/Routes.razor diff --git a/playground/eShopLite/MyFrontend/Components/_Imports.razor b/playground/TestShop/MyFrontend/Components/_Imports.razor similarity index 100% rename from playground/eShopLite/MyFrontend/Components/_Imports.razor rename to playground/TestShop/MyFrontend/Components/_Imports.razor diff --git a/playground/eShopLite/MyFrontend/MyFrontend.csproj b/playground/TestShop/MyFrontend/MyFrontend.csproj similarity index 100% rename from playground/eShopLite/MyFrontend/MyFrontend.csproj rename to playground/TestShop/MyFrontend/MyFrontend.csproj diff --git a/playground/eShopLite/MyFrontend/Program.cs b/playground/TestShop/MyFrontend/Program.cs similarity index 100% rename from playground/eShopLite/MyFrontend/Program.cs rename to playground/TestShop/MyFrontend/Program.cs diff --git a/playground/eShopLite/MyFrontend/Properties/launchSettings.json b/playground/TestShop/MyFrontend/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/MyFrontend/Properties/launchSettings.json rename to playground/TestShop/MyFrontend/Properties/launchSettings.json diff --git a/playground/eShopLite/MyFrontend/Services/BasketServiceClient.cs b/playground/TestShop/MyFrontend/Services/BasketServiceClient.cs similarity index 100% rename from playground/eShopLite/MyFrontend/Services/BasketServiceClient.cs rename to playground/TestShop/MyFrontend/Services/BasketServiceClient.cs diff --git a/playground/eShopLite/MyFrontend/Services/CatalogServiceClient.cs b/playground/TestShop/MyFrontend/Services/CatalogServiceClient.cs similarity index 100% rename from playground/eShopLite/MyFrontend/Services/CatalogServiceClient.cs rename to playground/TestShop/MyFrontend/Services/CatalogServiceClient.cs diff --git a/playground/eShopLite/MyFrontend/appsettings.Development.json b/playground/TestShop/MyFrontend/appsettings.Development.json similarity index 100% rename from playground/eShopLite/MyFrontend/appsettings.Development.json rename to playground/TestShop/MyFrontend/appsettings.Development.json diff --git a/playground/eShopLite/MyFrontend/appsettings.json b/playground/TestShop/MyFrontend/appsettings.json similarity index 100% rename from playground/eShopLite/MyFrontend/appsettings.json rename to playground/TestShop/MyFrontend/appsettings.json diff --git a/playground/eShopLite/MyFrontend/wwwroot/site.css b/playground/TestShop/MyFrontend/wwwroot/site.css similarity index 100% rename from playground/eShopLite/MyFrontend/wwwroot/site.css rename to playground/TestShop/MyFrontend/wwwroot/site.css diff --git a/playground/eShopLite/OrderProcessor/OrderProcessingWorker.cs b/playground/TestShop/OrderProcessor/OrderProcessingWorker.cs similarity index 100% rename from playground/eShopLite/OrderProcessor/OrderProcessingWorker.cs rename to playground/TestShop/OrderProcessor/OrderProcessingWorker.cs diff --git a/playground/eShopLite/OrderProcessor/OrderProcessor.csproj b/playground/TestShop/OrderProcessor/OrderProcessor.csproj similarity index 100% rename from playground/eShopLite/OrderProcessor/OrderProcessor.csproj rename to playground/TestShop/OrderProcessor/OrderProcessor.csproj diff --git a/playground/eShopLite/OrderProcessor/Program.cs b/playground/TestShop/OrderProcessor/Program.cs similarity index 100% rename from playground/eShopLite/OrderProcessor/Program.cs rename to playground/TestShop/OrderProcessor/Program.cs diff --git a/playground/eShopLite/OrderProcessor/Properties/launchSettings.json b/playground/TestShop/OrderProcessor/Properties/launchSettings.json similarity index 100% rename from playground/eShopLite/OrderProcessor/Properties/launchSettings.json rename to playground/TestShop/OrderProcessor/Properties/launchSettings.json diff --git a/playground/eShopLite/OrderProcessor/appsettings.Development.json b/playground/TestShop/OrderProcessor/appsettings.Development.json similarity index 100% rename from playground/eShopLite/OrderProcessor/appsettings.Development.json rename to playground/TestShop/OrderProcessor/appsettings.Development.json diff --git a/playground/eShopLite/OrderProcessor/appsettings.json b/playground/TestShop/OrderProcessor/appsettings.json similarity index 100% rename from playground/eShopLite/OrderProcessor/appsettings.json rename to playground/TestShop/OrderProcessor/appsettings.json diff --git a/playground/eShopLite/ServiceDefaults/Extensions.cs b/playground/TestShop/ServiceDefaults/Extensions.cs similarity index 100% rename from playground/eShopLite/ServiceDefaults/Extensions.cs rename to playground/TestShop/ServiceDefaults/Extensions.cs diff --git a/playground/eShopLite/ServiceDefaults/ServiceDefaults.csproj b/playground/TestShop/ServiceDefaults/ServiceDefaults.csproj similarity index 100% rename from playground/eShopLite/ServiceDefaults/ServiceDefaults.csproj rename to playground/TestShop/ServiceDefaults/ServiceDefaults.csproj diff --git a/playground/eShopLite/eShopLite.sln b/playground/TestShop/TestShop.sln similarity index 89% rename from playground/eShopLite/eShopLite.sln rename to playground/TestShop/TestShop.sln index a74cabbac0..2fc33d1112 100644 --- a/playground/eShopLite/eShopLite.sln +++ b/playground/TestShop/TestShop.sln @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppHost", "AppHost\AppHost. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrderProcessor", "OrderProcessor\OrderProcessor.csproj", "{7926680B-CE02-4AE8-AED2-E95678309289}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatalogModel", "CatalogModel\CatalogModel.csproj", "{AAD6BF29-5FB9-4CA5-8B84-4863B27D5228}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +53,10 @@ Global {7926680B-CE02-4AE8-AED2-E95678309289}.Debug|Any CPU.Build.0 = Debug|Any CPU {7926680B-CE02-4AE8-AED2-E95678309289}.Release|Any CPU.ActiveCfg = Release|Any CPU {7926680B-CE02-4AE8-AED2-E95678309289}.Release|Any CPU.Build.0 = Release|Any CPU + {AAD6BF29-5FB9-4CA5-8B84-4863B27D5228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAD6BF29-5FB9-4CA5-8B84-4863B27D5228}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAD6BF29-5FB9-4CA5-8B84-4863B27D5228}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAD6BF29-5FB9-4CA5-8B84-4863B27D5228}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/playground/eShopLite/build-containers.cmd b/playground/TestShop/build-containers.cmd similarity index 100% rename from playground/eShopLite/build-containers.cmd rename to playground/TestShop/build-containers.cmd diff --git a/playground/dapr/ServiceA/DaprServiceA.csproj b/playground/dapr/ServiceA/DaprServiceA.csproj index 89c4ef7c23..5015b0dac0 100644 --- a/playground/dapr/ServiceA/DaprServiceA.csproj +++ b/playground/dapr/ServiceA/DaprServiceA.csproj @@ -14,7 +14,7 @@ - + diff --git a/playground/dapr/ServiceB/DaprServiceB.csproj b/playground/dapr/ServiceB/DaprServiceB.csproj index 89c4ef7c23..5015b0dac0 100644 --- a/playground/dapr/ServiceB/DaprServiceB.csproj +++ b/playground/dapr/ServiceB/DaprServiceB.csproj @@ -14,7 +14,7 @@ - +