microsoft · eerhardt · Nov 2, 2023 · Oct 3, 2023 · Oct 11, 2023 · Oct 1, 2023
diff --git a/Aspire.sln b/Aspire.sln
@@ -132,6 +132,13 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Azure.CosmosDB", "src\Components\Aspire.Azure.CosmosDB\Aspire.Azure.CosmosDB.csproj", "{23298562-C1D4-41CD-83FE-426C94FEE35F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Azure.EntityFrameworkCore.CosmosDB", "src\Components\Aspire.Azure.EntityFrameworkCore.CosmosDB\Aspire.Azure.EntityFrameworkCore.CosmosDB.csproj", "{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Azure.CosmosDB.Tests", "tests\Aspire.Azure.CosmosDB.Tests\Aspire.Azure.CosmosDB.Tests.csproj", "{A5836BC1-6A45-4BB6-9D22-A7F750890AB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Azure.EntityFrameworkCore.CosmosDB.Tests", "tests\Aspire.Azure.EntityFrameworkCore.CosmosDB.Tests\Aspire.Azure.EntityFrameworkCore.CosmosDB.Tests.csproj", "{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -359,6 +366,22 @@ Global
 		{D4BD974F-6505-43FC-A94E-2019F0DB5D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4BD974F-6505-43FC-A94E-2019F0DB5D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4BD974F-6505-43FC-A94E-2019F0DB5D5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23298562-C1D4-41CD-83FE-426C94FEE35F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23298562-C1D4-41CD-83FE-426C94FEE35F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23298562-C1D4-41CD-83FE-426C94FEE35F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23298562-C1D4-41CD-83FE-426C94FEE35F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5836BC1-6A45-4BB6-9D22-A7F750890AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5836BC1-6A45-4BB6-9D22-A7F750890AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5836BC1-6A45-4BB6-9D22-A7F750890AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5836BC1-6A45-4BB6-9D22-A7F750890AB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDA02617-9C49-4DA8-A43A-A34DBA9B8596}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -423,6 +446,10 @@ Global
 		{E2EC79D0-80F7-4471-9613-D7C8C3D52F95} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
 		{D4BD974F-6505-43FC-A94E-2019F0DB5D5D} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
 		{A68BA1A5-1604-433D-9778-DC0199831C2A} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
+		{23298562-C1D4-41CD-83FE-426C94FEE35F} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
+		{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
+		{A5836BC1-6A45-4BB6-9D22-A7F750890AB8} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
+		{FDA02617-9C49-4DA8-A43A-A34DBA9B8596} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,6 +13,7 @@
     <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.17.0" />
     <PackageVersion Include="Azure.Storage.Queues" Version="12.15.0" />
+    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.35.4-preview" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.0" />
     <!-- Azure Management SDK for .NET dependencies -->
     <PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.2.0-beta.2" />
@@ -42,6 +43,7 @@
     <!-- sql client dependencies -->
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.1" />
     <!-- efcore dependencies -->
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.0-rtm.23512.13" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rtm.23512.13" />
     <!-- runtime dependencies-->
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(RuntimeVersion)" />

diff --git a/samples/eShopLite/AppHost/Program.cs b/samples/eShopLite/AppHost/Program.cs
@@ -5,13 +5,12 @@
 var grafana = builder.AddContainer("grafana", "grafana/grafana")
                      .WithServiceBinding(containerPort: 3000, name: "grafana-http", scheme: "http");
 
-var catalogdb = builder.AddPostgresContainer("postgres").AddDatabase("catalog");
+var catalogdb = builder.AddAzureCosmosDB("cosmosdb").AddDatabase("catalogdb");
 
 var redis = builder.AddRedisContainer("basketCache");
 
 var catalog = builder.AddProject<Projects.CatalogService>("catalogservice")
-                     .WithReference(catalogdb)
-                     .WithReplicas(2);
+    .WithAzureCosmosDB(catalogdb);
 
 var serviceBus = builder.AddAzureServiceBus("messaging", queueNames: ["orders"]);
 

diff --git a/samples/eShopLite/CatalogService/CatalogContextSeed.cs b/samples/eShopLite/CatalogService/CatalogContextSeed.cs
@@ -8,26 +8,6 @@ public static async Task InitializeDatabaseAsync(this IServiceProvider servicePr
     {
         using var scope = serviceProvider.CreateScope();
         var dbContext = scope.ServiceProvider.GetRequiredService<CatalogDbContext>();
-        var delayMs = 1000;
-        var retries = 0;
-        var maxRetryCount = 10;
-
-        while (true)
-        {
-            try
-            {
-                await dbContext.Database.MigrateAsync();
-                break;
-            }
-            catch when (retries < maxRetryCount)
-            {
-                await Task.Delay(delayMs);
-                delayMs *= 2;
-            }
-
-            retries++;
-        }
-
         await SeedAsync(dbContext);
     }
 
@@ -36,21 +16,21 @@ private static async Task SeedAsync(CatalogDbContext context)
         static List<CatalogBrand> GetPreconfiguredCatalogBrands()
         {
             return [
-                new() { Brand = "Azure" },
-                new() { Brand = ".NET" },
-                new() { Brand = "Visual Studio" },
-                new() { Brand = "SQL Server" },
-                new() { Brand = "Other" }
+                new() { Id = 0, Brand = "Azure" },
+                new() { Id = 1, Brand = ".NET" },
+                new() { Id = 2, Brand = "Visual Studio" },
+                new() { Id = 3, Brand = "SQL Server" },
+                new() { Id = 4, Brand = "Other" }
             ];
         }
 
         static List<CatalogType> GetPreconfiguredCatalogTypes()
         {
             return [
-                new() { Type = "Mug" },
-                new() { Type = "T-Shirt" },
-                new() { Type = "Sheet" },
-                new() { Type = "USB Memory Stick" }
+                new() { Id = 0, Type = "Mug" },
+                new() { Id = 1, Type = "T-Shirt" },
+                new() { Id = 2, Type = "Sheet" },
+                new() { Id = 3, Type = "USB Memory Stick" }
             ];
         }
 
@@ -64,36 +44,36 @@ static List<CatalogItem> GetPreconfiguredItems(DbSet<CatalogBrand> catalogBrands
             var sheet = catalogTypes.First(c => c.Type == "Sheet");
 
             return [
-                new() { CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Bot Black Hoodie", Name = ".NET Bot Black Hoodie", Price = 19.5M, PictureFileName = "1.png" },
-                new() { CatalogType = mug, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Black & White Mug", Name = ".NET Black & White Mug", Price = 8.50M, PictureFileName = "2.png" },
-                new() { CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureFileName = "3.png" },
-                new() { CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Foundation T-shirt", Name = ".NET Foundation T-shirt", Price = 12, PictureFileName = "4.png" },
-                new() { CatalogType = sheet, CatalogBrand = other, AvailableStock = 100, Description = "Roslyn Red Sheet", Name = "Roslyn Red Sheet", Price = 8.5M, PictureFileName = "5.png" },
-                new() { CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Blue Hoodie", Name = ".NET Blue Hoodie", Price = 12, PictureFileName = "6.png" },
-                new() { CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureFileName = "7.png" },
-                new() { CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Kudu Purple Hoodie", Name = "Kudu Purple Hoodie", Price = 8.5M, PictureFileName = "8.png" },
-                new() { CatalogType = mug, CatalogBrand = other, AvailableStock = 100, Description = "Cup<T> White Mug", Name = "Cup<T> White Mug", Price = 12, PictureFileName = "9.png" },
-                new() { CatalogType = sheet, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Foundation Sheet", Name = ".NET Foundation Sheet", Price = 12, PictureFileName = "10.png" },
-                new() { CatalogType = sheet, CatalogBrand = dotNet, AvailableStock = 100, Description = "Cup<T> Sheet", Name = "Cup<T> Sheet", Price = 8.5M, PictureFileName = "11.png" },
-                new() { CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Prism White TShirt", Name = "Prism White TShirt", Price = 12, PictureFileName = "12.png" }
+                new() { Id = 0, CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Bot Black Hoodie", Name = ".NET Bot Black Hoodie", Price = 19.5M, PictureFileName = "1.png" },
+                new() { Id = 1, CatalogType = mug, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Black & White Mug", Name = ".NET Black & White Mug", Price = 8.50M, PictureFileName = "2.png" },
+                new() { Id = 2, CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureFileName = "3.png" },
+                new() { Id = 3, CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Foundation T-shirt", Name = ".NET Foundation T-shirt", Price = 12, PictureFileName = "4.png" },
+                new() { Id = 4, CatalogType = sheet, CatalogBrand = other, AvailableStock = 100, Description = "Roslyn Red Sheet", Name = "Roslyn Red Sheet", Price = 8.5M, PictureFileName = "5.png" },
+                new() { Id = 5, CatalogType = tshirt, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Blue Hoodie", Name = ".NET Blue Hoodie", Price = 12, PictureFileName = "6.png" },
+                new() { Id = 6, CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureFileName = "7.png" },
+                new() { Id = 7, CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Kudu Purple Hoodie", Name = "Kudu Purple Hoodie", Price = 8.5M, PictureFileName = "8.png" },
+                new() { Id = 8, CatalogType = mug, CatalogBrand = other, AvailableStock = 100, Description = "Cup<T> White Mug", Name = "Cup<T> White Mug", Price = 12, PictureFileName = "9.png" },
+                new() { Id = 9, CatalogType = sheet, CatalogBrand = dotNet, AvailableStock = 100, Description = ".NET Foundation Sheet", Name = ".NET Foundation Sheet", Price = 12, PictureFileName = "10.png" },
+                new() { Id = 10, CatalogType = sheet, CatalogBrand = dotNet, AvailableStock = 100, Description = "Cup<T> Sheet", Name = "Cup<T> Sheet", Price = 8.5M, PictureFileName = "11.png" },
+                new() { Id = 11, CatalogType = tshirt, CatalogBrand = other, AvailableStock = 100, Description = "Prism White TShirt", Name = "Prism White TShirt", Price = 12, PictureFileName = "12.png" }
             ];
         }
-
-        if (!context.CatalogBrands.Any())
+        await context.Database.EnsureCreatedAsync();
+        if (context.CatalogBrands.FirstOrDefault() is null)
         {
             await context.CatalogBrands.AddRangeAsync(GetPreconfiguredCatalogBrands());
 
             await context.SaveChangesAsync();
         }
 
-        if (!context.CatalogTypes.Any())
+        if (context.CatalogTypes.FirstOrDefault() is null)
         {
             await context.CatalogTypes.AddRangeAsync(GetPreconfiguredCatalogTypes());
 
             await context.SaveChangesAsync();
         }
 
-        if (!context.CatalogItems.Any())
+        if (context.CatalogItems.FirstOrDefault() is null)
         {
             await context.CatalogItems.AddRangeAsync(GetPreconfiguredItems(context.CatalogBrands, context.CatalogTypes));
 

diff --git a/samples/eShopLite/CatalogService/CatalogService.csproj b/samples/eShopLite/CatalogService/CatalogService.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Components\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj" />
+    <ProjectReference Include="..\..\..\src\Components\Aspire.Azure.EntityFrameworkCore.CosmosDB\Aspire.Azure.EntityFrameworkCore.CosmosDB.csproj" />
     <ProjectReference Include="..\ServiceDefaults\ServiceDefaults.csproj" />
   </ItemGroup>
 

diff --git a/samples/eShopLite/CatalogService/Migrations/20230517065317_Initial.Designer.cs b/samples/eShopLite/CatalogService/Migrations/20230517065317_Initial.Designer.cs