Remove CPM completely & start of lab 5 (#19)

* Detach lab 5 from CPM & start of end * WIP * WIP * Detach lab 6 from CPM * Remove CPM * Fixes * Remove CMP opt-out lines
dotnet-presentations · Feb 11, 2024 · fa13522 · fa13522
1 parent 33af23c
commit fa13522
Show file tree

Hide file tree

Showing 394 changed files with 9,983 additions and 512 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/kill b/kill
diff --git a/labs/1-Create-Catalog-API/README.md b/labs/1-Create-Catalog-API/README.md
@@ -144,6 +144,7 @@ Now that we've setup the solution to use Aspire for composing our distributed ap
 
     ![VS Web API project template options](./img/vs-web-api-template-options.png)
 
+1. In the newly created project, update the package reference to `Swashbuckle.AspNetCore` to version `6.5.0`
 1. Open the `Program.cs` file of the `eShop.AppHost` project, and update it so the API project you just added is named `"catalog-api"` and has a reference to the `CatalogDB`:
 
     ```csharp
@@ -194,6 +195,7 @@ Now that we've setup the solution to use Aspire for composing our distributed ap
     ```
 
     This method will define the endpoint routes for the Catalog API.
+
 1. In the method, add a call to `app.MapGet` to define an endpoint that responds to GET requests to the `/items` path, and is handled by an async lambda that accepts two parameters: a `PaginationRequest` type that will represent the shape of the request, and the `CatalogDbContext` instance that will come from the DI container:
 
     ```csharp

diff --git a/labs/1-Create-Catalog-API/end/Catalog.API/Catalog.API.csproj b/labs/1-Create-Catalog-API/end/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,7 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/2-Create-Blazor-Frontend/end/Catalog.API/Catalog.API.csproj b/labs/2-Create-Blazor-Frontend/end/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.API</RootNamespace>
     <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj b/labs/2-Create-Blazor-Frontend/end/WebApp/WebApp.csproj
@@ -5,7 +5,6 @@
     <UserSecretsId>2d86f364-a439-47c5-9468-3b85a7d9a18e</UserSecretsId>
     <Nullable>enable</Nullable>
     <RootNamespace>eShop.WebApp</RootNamespace>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -7,7 +7,6 @@
     <IsAspireHost>true</IsAspireHost>
     <IsPackable>false</IsPackable>
     <UserSecretsId>b99dbce4-17d4-41d2-858a-2b0529d60bb8</UserSecretsId>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/2-Create-Blazor-Frontend/src/Catalog.API/Catalog.API.csproj b/labs/2-Create-Blazor-Frontend/src/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.API</RootNamespace>
     <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/2-Create-Blazor-Frontend/src/WebApp/WebApp.csproj b/labs/2-Create-Blazor-Frontend/src/WebApp/WebApp.csproj
@@ -5,7 +5,6 @@
     <UserSecretsId>2d86f364-a439-47c5-9468-3b85a7d9a18e</UserSecretsId>
     <Nullable>enable</Nullable>
     <RootNamespace>eShop.WebApp</RootNamespace>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -7,7 +7,6 @@
     <IsAspireHost>true</IsAspireHost>
     <IsPackable>false</IsPackable>
     <UserSecretsId>b99dbce4-17d4-41d2-858a-2b0529d60bb8</UserSecretsId>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/end/Catalog.API/Catalog.API.csproj b/labs/3-Add-Identity/end/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.API</RootNamespace>
     <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj b/labs/3-Add-Identity/end/Catalog.Data/Catalog.Data.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/end/WebApp/WebApp.csproj b/labs/3-Add-Identity/end/WebApp/WebApp.csproj
@@ -5,7 +5,6 @@
     <UserSecretsId>2d86f364-a439-47c5-9468-3b85a7d9a18e</UserSecretsId>
     <Nullable>enable</Nullable>
     <RootNamespace>eShop.WebApp</RootNamespace>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj b/labs/3-Add-Identity/end/eShop.AppHost/eShop.AppHost.csproj
@@ -7,7 +7,6 @@
     <IsAspireHost>true</IsAspireHost>
     <IsPackable>false</IsPackable>
     <UserSecretsId>b99dbce4-17d4-41d2-858a-2b0529d60bb8</UserSecretsId>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/3-Add-Identity/end/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/src/Catalog.API/Catalog.API.csproj b/labs/3-Add-Identity/src/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.API</RootNamespace>
     <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj b/labs/3-Add-Identity/src/Catalog.Data/Catalog.Data.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/src/WebApp/WebApp.csproj b/labs/3-Add-Identity/src/WebApp/WebApp.csproj
@@ -5,7 +5,6 @@
     <UserSecretsId>2d86f364-a439-47c5-9468-3b85a7d9a18e</UserSecretsId>
     <Nullable>enable</Nullable>
     <RootNamespace>eShop.WebApp</RootNamespace>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj b/labs/3-Add-Identity/src/eShop.AppHost/eShop.AppHost.csproj
@@ -7,7 +7,6 @@
     <IsAspireHost>true</IsAspireHost>
     <IsPackable>false</IsPackable>
     <UserSecretsId>b99dbce4-17d4-41d2-858a-2b0529d60bb8</UserSecretsId>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/labs/3-Add-Identity/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/4-Add-Shopping-Basket/README.md b/labs/4-Add-Shopping-Basket/README.md
@@ -205,10 +205,6 @@ In previous labs, we have created a web site that shoppers can use to browser a
     {
         public int ProductId { get; set; }
 
-        public string? ProductName { get; set; }
-
-        public decimal UnitPrice { get; set; }
-
         public int Quantity { get; set; }
     }
     ```

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Basket.API</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/4-Add-Shopping-Basket/end/Basket.API/Models/BasketItem.cs b/labs/4-Add-Shopping-Basket/end/Basket.API/Models/BasketItem.cs
@@ -4,9 +4,5 @@ public class BasketItem
 {
     public int ProductId { get; set; }
 
-    //public string? ProductName { get; set; }
-
-    //public decimal UnitPrice { get; set; }
-
     public int Quantity { get; set; }
 }
diff --git a/labs/4-Add-Shopping-Basket/end/Catalog.API/Catalog.API.csproj b/labs/4-Add-Shopping-Basket/end/Catalog.API/Catalog.API.csproj
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.API</RootNamespace>
     <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data.Manager</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

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
@@ -5,7 +5,6 @@
     <RootNamespace>eShop.Catalog.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/labs/4-Add-Shopping-Basket/end/GrpcService1/GrpcService1.csproj b/labs/4-Add-Shopping-Basket/end/GrpcService1/GrpcService1.csproj