diff --git a/README.md b/README.md index cacc234..039d7e1 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you're using macOs or Linux, or on Windows but don't want to use Visual Studi ### Updating and installing the .NET SDK workload for Aspire -After installing Visual Studio Preview or the required .NET SDK, you will need to update and install the .NET SDK workload for Aspire. This workshop is using the latest preview of .NET Aspire (preview.6). For your convenience, scripts are provided in this repository to make this process easy: +After installing Visual Studio Preview or the required .NET SDK, you will need to update and install the .NET SDK workload for Aspire. This workshop is using the latest preview of .NET Aspire (preview.7). For your convenience, scripts are provided in this repository to make this process easy: 1. Clone [this repo](https://github.com/dotnet-presentations/eshop-app-workshop) to your machine. 1. In your terminal, navigate to the repo root and run the command `dotnet --version` to verify you are using version 8.0.100 or later of the .NET SDK: @@ -43,7 +43,7 @@ After installing Visual Studio Preview or the required .NET SDK, you will need t build.sh ``` -1. This script will download and install the latest build of the preview.6 version of the Aspire workload, followed by building all solutions in this repo. +1. This script will download and install the latest build of the preview.7 version of the Aspire workload, followed by building all solutions in this repo. 1. If your machine is successfully configured, you should see a message indicating the build succeeded: ```shell diff --git a/build/Build.proj b/build/Build.proj index 65935f3..e03e788 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -1,6 +1,8 @@ net8.0 + + False @@ -12,7 +14,7 @@ - + @@ -21,7 +23,7 @@ - + --> @@ -29,7 +31,7 @@ - + diff --git a/labs/1-Create-Catalog-API/README.md b/labs/1-Create-Catalog-API/README.md index 16e3f19..6e32e77 100644 --- a/labs/1-Create-Catalog-API/README.md +++ b/labs/1-Create-Catalog-API/README.md @@ -139,7 +139,7 @@ Containers are extremely useful for hosting service dependencies, but rather tha ``` ```xml - + ``` 1. Use the methods on the `builder` variable to create a PostgreSQL instance called `postgres` with pgAdmin enabled, and a database called `CatalogDB`. Ensure that the `catalog-db-mgr` project resource is configured with a reference to the `catalogDb`: diff --git a/labs/1-Create-Catalog-API/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/1-Create-Catalog-API/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 764bd34..f0d5f59 100644 --- a/labs/1-Create-Catalog-API/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/1-Create-Catalog-API/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/1-Create-Catalog-API/end/Catalog.Data/Catalog.Data.csproj b/labs/1-Create-Catalog-API/end/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/1-Create-Catalog-API/end/Catalog.Data/Catalog.Data.csproj +++ b/labs/1-Create-Catalog-API/end/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/1-Create-Catalog-API/end/eShop.AppHost/eShop.AppHost.csproj b/labs/1-Create-Catalog-API/end/eShop.AppHost/eShop.AppHost.csproj index e8a71f4..9f745a6 100644 --- a/labs/1-Create-Catalog-API/end/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/1-Create-Catalog-API/end/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/1-Create-Catalog-API/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/1-Create-Catalog-API/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index 0f94c4f..0705bec 100644 --- a/labs/1-Create-Catalog-API/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/1-Create-Catalog-API/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -12,7 +12,7 @@ - + diff --git a/labs/1-Create-Catalog-API/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/1-Create-Catalog-API/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index f0e0b03..0e2a543 100644 --- a/labs/1-Create-Catalog-API/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/1-Create-Catalog-API/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/1-Create-Catalog-API/src/Catalog.Data/Catalog.Data.csproj b/labs/1-Create-Catalog-API/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/1-Create-Catalog-API/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/1-Create-Catalog-API/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/2-Create-Blazor-Frontend/README.md b/labs/2-Create-Blazor-Frontend/README.md index df38345..dd87929 100644 --- a/labs/2-Create-Blazor-Frontend/README.md +++ b/labs/2-Create-Blazor-Frontend/README.md @@ -163,10 +163,10 @@ Now that we have a service we can use to easily retrieve the catalog items from ![Catalog page with no item images](./img/eshop-web-catalog-no-images.png) 1. Open the browser developer tools (F12) and navigate to the **Network** pane then refresh the page. From the failed requests log we can see the images are trying to be loaded from paths like `/product-images/99`, where `99` is the product ID but the site doesn't have these files or any endpoint configured to serve them. Like the product details, the product images are served by the Catalog API. -1. [YARP](https://microsoft.github.io/reverse-proxy/) is a package for ASP.NET Core applications that provides highly customizable reverse proxying capabilities. We'll use YARP to proxy the product image requests to the frontend site on to the Catalog API. Add a reference to the `Microsoft.Extensions.ServiceDiscovery.Yarp` package, version `8.0.0-preview.6.24214.1`. You can use the [`dotnet` CLI](https://learn.microsoft.com/dotnet/core/tools/dotnet-add-package), or Visual Studio NuGet Package Manager, or edit the `WebApp.csproj` directly: +1. [YARP](https://microsoft.github.io/reverse-proxy/) is a package for ASP.NET Core applications that provides highly customizable reverse proxying capabilities. We'll use YARP to proxy the product image requests to the frontend site on to the Catalog API. Add a reference to the `Microsoft.Extensions.ServiceDiscovery.Yarp` package, version `8.0.0-preview.7.24251.11`. You can use the [`dotnet` CLI](https://learn.microsoft.com/dotnet/core/tools/dotnet-add-package), or Visual Studio NuGet Package Manager, or edit the `WebApp.csproj` directly: ```xml - + ``` 1. To setup the proxying behavior, first add a line to the `AddApplicationServices` method in the `HostingExtensions.cs` file, to add the require services to the application's DI container: diff --git a/labs/2-Create-Blazor-Frontend/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/2-Create-Blazor-Frontend/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/2-Create-Blazor-Frontend/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/2-Create-Blazor-Frontend/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/2-Create-Blazor-Frontend/end/Catalog.Data/Catalog.Data.csproj b/labs/2-Create-Blazor-Frontend/end/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/2-Create-Blazor-Frontend/end/Catalog.Data/Catalog.Data.csproj +++ b/labs/2-Create-Blazor-Frontend/end/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj b/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj index a0cb5c2..e6c7b93 100644 --- a/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj +++ b/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/2-Create-Blazor-Frontend/end/eShop.AppHost/eShop.AppHost.csproj b/labs/2-Create-Blazor-Frontend/end/eShop.AppHost/eShop.AppHost.csproj index 7858fe0..554f492 100644 --- a/labs/2-Create-Blazor-Frontend/end/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/2-Create-Blazor-Frontend/end/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/2-Create-Blazor-Frontend/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/2-Create-Blazor-Frontend/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index 000a26e..3ea593f 100644 --- a/labs/2-Create-Blazor-Frontend/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/2-Create-Blazor-Frontend/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -15,7 +15,7 @@ - + diff --git a/labs/2-Create-Blazor-Frontend/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/2-Create-Blazor-Frontend/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/2-Create-Blazor-Frontend/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/2-Create-Blazor-Frontend/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/2-Create-Blazor-Frontend/src/Catalog.Data/Catalog.Data.csproj b/labs/2-Create-Blazor-Frontend/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/2-Create-Blazor-Frontend/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/2-Create-Blazor-Frontend/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/2-Create-Blazor-Frontend/src/eShop.AppHost/eShop.AppHost.csproj b/labs/2-Create-Blazor-Frontend/src/eShop.AppHost/eShop.AppHost.csproj index 94cc40a..f7a0020 100644 --- a/labs/2-Create-Blazor-Frontend/src/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/2-Create-Blazor-Frontend/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/2-Create-Blazor-Frontend/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/2-Create-Blazor-Frontend/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index 000a26e..3ea593f 100644 --- a/labs/2-Create-Blazor-Frontend/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/2-Create-Blazor-Frontend/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -15,7 +15,7 @@ - + diff --git a/labs/3-Add-Identity/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/3-Add-Identity/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/3-Add-Identity/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/3-Add-Identity/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj b/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj +++ b/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/3-Add-Identity/end/WebApp/WebApp.csproj b/labs/3-Add-Identity/end/WebApp/WebApp.csproj index 878bbc8..1608dba 100644 --- a/labs/3-Add-Identity/end/WebApp/WebApp.csproj +++ b/labs/3-Add-Identity/end/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj b/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj index 7858fe0..554f492 100644 --- a/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/3-Add-Identity/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/3-Add-Identity/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/3-Add-Identity/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/3-Add-Identity/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj b/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/3-Add-Identity/src/WebApp/WebApp.csproj b/labs/3-Add-Identity/src/WebApp/WebApp.csproj index 0b76240..8792796 100644 --- a/labs/3-Add-Identity/src/WebApp/WebApp.csproj +++ b/labs/3-Add-Identity/src/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj b/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj index 7858fe0..554f492 100644 --- a/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/README.md b/labs/4-Add-Shopping-Basket/README.md index f1ced7a..27f7387 100644 --- a/labs/4-Add-Shopping-Basket/README.md +++ b/labs/4-Add-Shopping-Basket/README.md @@ -78,7 +78,7 @@ In the .NET CLI, we need to do a few steps manually to configure .NET Aspire orc ``` ```xml - + ``` 1. Open the `Program.cs` file in the `eShop.AppHost` project and add a line to create a new Redis resource named `"BasketStore"` and configure it to host a [Redis Commander](https://joeferner.github.io/redis-commander/) instance too (this will make it easier to inspect the Redis database during development). Capture the resource in a `basketStore` variable: @@ -143,7 +143,7 @@ In the .NET CLI, we need to do a few steps manually to configure .NET Aspire orc Add the `Aspire.StackExchange.Redis` component NuGet package to the `Basket.API` project. You can use the **Add > .NET Aspire Compoenent...** project menu item in Visual Studio, the `dotnet add package` command at the command line, or by editing the `Basket.API.csproj` file directly: ```xml - + ``` 1. In the `AddApplicationServices` method in `HostingExtensions.cs`, add a call to `AddRedis` to configure the Redis client in the application's DI container. Pass the name `"BasketStore"` to the method to indicate that the client should be configured to connect to the Redis resource with that name in the AppHost: diff --git a/labs/4-Add-Shopping-Basket/end/Basket.API/Basket.API.csproj b/labs/4-Add-Shopping-Basket/end/Basket.API/Basket.API.csproj index d036c99..3919fcb 100644 --- a/labs/4-Add-Shopping-Basket/end/Basket.API/Basket.API.csproj +++ b/labs/4-Add-Shopping-Basket/end/Basket.API/Basket.API.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/4-Add-Shopping-Basket/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/4-Add-Shopping-Basket/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/4-Add-Shopping-Basket/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/4-Add-Shopping-Basket/end/Catalog.Data/Catalog.Data.csproj b/labs/4-Add-Shopping-Basket/end/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/4-Add-Shopping-Basket/end/Catalog.Data/Catalog.Data.csproj +++ b/labs/4-Add-Shopping-Basket/end/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/end/WebApp/WebApp.csproj b/labs/4-Add-Shopping-Basket/end/WebApp/WebApp.csproj index 34af8f5..fd7baf9 100644 --- a/labs/4-Add-Shopping-Basket/end/WebApp/WebApp.csproj +++ b/labs/4-Add-Shopping-Basket/end/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/end/eShop.AppHost/eShop.AppHost.csproj b/labs/4-Add-Shopping-Basket/end/eShop.AppHost/eShop.AppHost.csproj index cee8083..139aa78 100644 --- a/labs/4-Add-Shopping-Basket/end/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/4-Add-Shopping-Basket/end/eShop.AppHost/eShop.AppHost.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/labs/4-Add-Shopping-Basket/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/4-Add-Shopping-Basket/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/4-Add-Shopping-Basket/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/4-Add-Shopping-Basket/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/4-Add-Shopping-Basket/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/4-Add-Shopping-Basket/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/4-Add-Shopping-Basket/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/4-Add-Shopping-Basket/src/Catalog.Data/Catalog.Data.csproj b/labs/4-Add-Shopping-Basket/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/4-Add-Shopping-Basket/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/4-Add-Shopping-Basket/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/src/WebApp/WebApp.csproj b/labs/4-Add-Shopping-Basket/src/WebApp/WebApp.csproj index 878bbc8..1608dba 100644 --- a/labs/4-Add-Shopping-Basket/src/WebApp/WebApp.csproj +++ b/labs/4-Add-Shopping-Basket/src/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/4-Add-Shopping-Basket/src/eShop.AppHost/eShop.AppHost.csproj b/labs/4-Add-Shopping-Basket/src/eShop.AppHost/eShop.AppHost.csproj index 7858fe0..554f492 100644 --- a/labs/4-Add-Shopping-Basket/src/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/4-Add-Shopping-Basket/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/labs/4-Add-Shopping-Basket/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/4-Add-Shopping-Basket/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/4-Add-Shopping-Basket/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/4-Add-Shopping-Basket/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/5-Add-Checkout/end/Basket.API/Basket.API.csproj b/labs/5-Add-Checkout/end/Basket.API/Basket.API.csproj index 8f95a9b..ffd9da0 100644 --- a/labs/5-Add-Checkout/end/Basket.API/Basket.API.csproj +++ b/labs/5-Add-Checkout/end/Basket.API/Basket.API.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/5-Add-Checkout/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/5-Add-Checkout/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/5-Add-Checkout/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/5-Add-Checkout/end/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/5-Add-Checkout/end/Catalog.Data/Catalog.Data.csproj b/labs/5-Add-Checkout/end/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/5-Add-Checkout/end/Catalog.Data/Catalog.Data.csproj +++ b/labs/5-Add-Checkout/end/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/5-Add-Checkout/end/Ordering.Data.Manager/Ordering.Data.Manager.csproj b/labs/5-Add-Checkout/end/Ordering.Data.Manager/Ordering.Data.Manager.csproj index fbdd23a..764d8de 100644 --- a/labs/5-Add-Checkout/end/Ordering.Data.Manager/Ordering.Data.Manager.csproj +++ b/labs/5-Add-Checkout/end/Ordering.Data.Manager/Ordering.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/5-Add-Checkout/end/Ordering.Data/Ordering.Data.csproj b/labs/5-Add-Checkout/end/Ordering.Data/Ordering.Data.csproj index 9568419..aabad27 100644 --- a/labs/5-Add-Checkout/end/Ordering.Data/Ordering.Data.csproj +++ b/labs/5-Add-Checkout/end/Ordering.Data/Ordering.Data.csproj @@ -8,6 +8,6 @@ - + diff --git a/labs/5-Add-Checkout/end/WebApp/WebApp.csproj b/labs/5-Add-Checkout/end/WebApp/WebApp.csproj index 788c263..b890c81 100644 --- a/labs/5-Add-Checkout/end/WebApp/WebApp.csproj +++ b/labs/5-Add-Checkout/end/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/5-Add-Checkout/end/eShop.AppHost/eShop.AppHost.csproj b/labs/5-Add-Checkout/end/eShop.AppHost/eShop.AppHost.csproj index 5223cfd..72e510c 100644 --- a/labs/5-Add-Checkout/end/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/5-Add-Checkout/end/eShop.AppHost/eShop.AppHost.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/labs/5-Add-Checkout/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/5-Add-Checkout/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/5-Add-Checkout/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/5-Add-Checkout/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/5-Add-Checkout/src/Basket.API/Basket.API.csproj b/labs/5-Add-Checkout/src/Basket.API/Basket.API.csproj index 8f95a9b..ffd9da0 100644 --- a/labs/5-Add-Checkout/src/Basket.API/Basket.API.csproj +++ b/labs/5-Add-Checkout/src/Basket.API/Basket.API.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/5-Add-Checkout/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/5-Add-Checkout/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/5-Add-Checkout/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/5-Add-Checkout/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/5-Add-Checkout/src/Catalog.Data/Catalog.Data.csproj b/labs/5-Add-Checkout/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/5-Add-Checkout/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/5-Add-Checkout/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/5-Add-Checkout/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj b/labs/5-Add-Checkout/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj index fbdd23a..764d8de 100644 --- a/labs/5-Add-Checkout/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj +++ b/labs/5-Add-Checkout/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/5-Add-Checkout/src/Ordering.Data/Ordering.Data.csproj b/labs/5-Add-Checkout/src/Ordering.Data/Ordering.Data.csproj index 9568419..aabad27 100644 --- a/labs/5-Add-Checkout/src/Ordering.Data/Ordering.Data.csproj +++ b/labs/5-Add-Checkout/src/Ordering.Data/Ordering.Data.csproj @@ -8,6 +8,6 @@ - + diff --git a/labs/5-Add-Checkout/src/WebApp/WebApp.csproj b/labs/5-Add-Checkout/src/WebApp/WebApp.csproj index 788c263..b890c81 100644 --- a/labs/5-Add-Checkout/src/WebApp/WebApp.csproj +++ b/labs/5-Add-Checkout/src/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/5-Add-Checkout/src/eShop.AppHost/eShop.AppHost.csproj b/labs/5-Add-Checkout/src/eShop.AppHost/eShop.AppHost.csproj index 65db870..62d08f7 100644 --- a/labs/5-Add-Checkout/src/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/5-Add-Checkout/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/labs/5-Add-Checkout/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/5-Add-Checkout/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/5-Add-Checkout/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/5-Add-Checkout/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/labs/6-Add-Resiliency/src/Basket.API/Basket.API.csproj b/labs/6-Add-Resiliency/src/Basket.API/Basket.API.csproj index eb29e1a..f9c49cb 100644 --- a/labs/6-Add-Resiliency/src/Basket.API/Basket.API.csproj +++ b/labs/6-Add-Resiliency/src/Basket.API/Basket.API.csproj @@ -6,7 +6,7 @@ - + diff --git a/labs/6-Add-Resiliency/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/labs/6-Add-Resiliency/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/labs/6-Add-Resiliency/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/labs/6-Add-Resiliency/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/6-Add-Resiliency/src/Catalog.Data/Catalog.Data.csproj b/labs/6-Add-Resiliency/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/labs/6-Add-Resiliency/src/Catalog.Data/Catalog.Data.csproj +++ b/labs/6-Add-Resiliency/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/labs/6-Add-Resiliency/src/Ordering.API/Ordering.API.csproj b/labs/6-Add-Resiliency/src/Ordering.API/Ordering.API.csproj index aad79c7..e281e09 100644 --- a/labs/6-Add-Resiliency/src/Ordering.API/Ordering.API.csproj +++ b/labs/6-Add-Resiliency/src/Ordering.API/Ordering.API.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/labs/6-Add-Resiliency/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj b/labs/6-Add-Resiliency/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj index fbdd23a..764d8de 100644 --- a/labs/6-Add-Resiliency/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj +++ b/labs/6-Add-Resiliency/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/labs/6-Add-Resiliency/src/Ordering.Data/Ordering.Data.csproj b/labs/6-Add-Resiliency/src/Ordering.Data/Ordering.Data.csproj index d7f4ed1..d01b356 100644 --- a/labs/6-Add-Resiliency/src/Ordering.Data/Ordering.Data.csproj +++ b/labs/6-Add-Resiliency/src/Ordering.Data/Ordering.Data.csproj @@ -8,6 +8,6 @@ - + diff --git a/labs/6-Add-Resiliency/src/WebApp/WebApp.csproj b/labs/6-Add-Resiliency/src/WebApp/WebApp.csproj index 788c263..b890c81 100644 --- a/labs/6-Add-Resiliency/src/WebApp/WebApp.csproj +++ b/labs/6-Add-Resiliency/src/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/labs/6-Add-Resiliency/src/eShop.AppHost/eShop.AppHost.csproj b/labs/6-Add-Resiliency/src/eShop.AppHost/eShop.AppHost.csproj index 5223cfd..72e510c 100644 --- a/labs/6-Add-Resiliency/src/eShop.AppHost/eShop.AppHost.csproj +++ b/labs/6-Add-Resiliency/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/labs/6-Add-Resiliency/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/6-Add-Resiliency/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/labs/6-Add-Resiliency/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/labs/6-Add-Resiliency/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Basket.API/Basket.API.csproj b/src/Basket.API/Basket.API.csproj index 38fd121..14ad031 100644 --- a/src/Basket.API/Basket.API.csproj +++ b/src/Basket.API/Basket.API.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj b/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj index 921f244..7ea9ffb 100644 --- a/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj +++ b/src/Catalog.Data.Manager/Catalog.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Catalog.Data/Catalog.Data.csproj b/src/Catalog.Data/Catalog.Data.csproj index f0147a7..fe860c6 100644 --- a/src/Catalog.Data/Catalog.Data.csproj +++ b/src/Catalog.Data/Catalog.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/IntegrationTests/IntegrationTests.csproj b/src/IntegrationTests/IntegrationTests.csproj index 9a32489..97a15ea 100644 --- a/src/IntegrationTests/IntegrationTests.csproj +++ b/src/IntegrationTests/IntegrationTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Ordering.API/Ordering.API.csproj b/src/Ordering.API/Ordering.API.csproj index aad79c7..e281e09 100644 --- a/src/Ordering.API/Ordering.API.csproj +++ b/src/Ordering.API/Ordering.API.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj b/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj index fbdd23a..764d8de 100644 --- a/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj +++ b/src/Ordering.Data.Manager/Ordering.Data.Manager.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Ordering.Data/Ordering.Data.csproj b/src/Ordering.Data/Ordering.Data.csproj index d7f4ed1..d01b356 100644 --- a/src/Ordering.Data/Ordering.Data.csproj +++ b/src/Ordering.Data/Ordering.Data.csproj @@ -8,6 +8,6 @@ - + diff --git a/src/WebApp/WebApp.csproj b/src/WebApp/WebApp.csproj index 788c263..b890c81 100644 --- a/src/WebApp/WebApp.csproj +++ b/src/WebApp/WebApp.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/eShop.AppHost/eShop.AppHost.csproj b/src/eShop.AppHost/eShop.AppHost.csproj index 5223cfd..72e510c 100644 --- a/src/eShop.AppHost/eShop.AppHost.csproj +++ b/src/eShop.AppHost/eShop.AppHost.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index f1238a6..19e867e 100644 --- a/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -16,7 +16,7 @@ - +