Split into separate packages for azure and non azure. (#536)

* Split into separate packages for azure and non azure. Rename redis based on new naming convention Move projects into Dapr specific directories for ease of location Add custom logic for azure to handle PublishAsAzureContainer * copy readme to azure lib * Update links * fixes to test references * Move files out of dapr specific folders - use solution folders only * Fix project reference in apphost * Update azure redis library to use azure dapr package --------- Co-authored-by: Aaron Powell <[email protected]>
CommunityToolkit · Mar 7, 2025 · 33b6627 · 33b6627
1 parent af41793
commit 33b6627
Show file tree

Hide file tree

Showing 49 changed files with 347 additions and 180 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,8 +23,8 @@ jobs:
             Hosting.Azure.DataApiBuilder.Tests,
             Hosting.Azure.StaticWebApps.Tests,
             Hosting.Bun.Tests,
-            Hosting.Dapr.AzureExtensions.Tests,
-            Hosting.Dapr.AzureRedis.Tests,
+            Hosting.Azure.Dapr.Tests,
+            Hosting.Azure.Dapr.Redis.Tests,
             Hosting.Dapr.Tests,
             Hosting.DbGate.Tests,
             Hosting.Deno.Tests,

diff --git a/CommunityToolkit.Aspire.sln b/CommunityToolkit.Aspire.sln
@@ -189,17 +189,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Mas
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ", "src\CommunityToolkit.Aspire.Hosting.ActiveMQ\CommunityToolkit.Aspire.Hosting.ActiveMQ.csproj", "{0761C6CF-28E8-FC0F-6AF3-213E4B312DD0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr-ext", "dapr-ext", "{914A2506-9587-4DFF-ADC0-1D97798ABC8F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.AppHost", "examples\dapr-ext\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.AppHost\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.AppHost.csproj", "{022998DB-98FE-45EB-A145-DB0B1C12EEE5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis", "src\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.csproj", "{8575F535-5E8A-49AB-BC2E-2A0417FB636B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.ApiService", "examples\dapr-ext\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.ApiService\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.ApiService.csproj", "{995804A3-7D89-4E0A-952E-A5A4161734F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AzureExtensions.Tests", "tests\CommunityToolkit.Aspire.Hosting.Dapr.AzureExtensions.Tests\CommunityToolkit.Aspire.Hosting.Dapr.AzureExtensions.Tests.csproj", "{EC41302D-7E37-4703-A053-BF4097FF6B26}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.Tests", "tests\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.Tests\CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.Tests.csproj", "{ADF36205-629B-4822-99F3-88544F6B79CA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr-azure", "dapr-azure", "{914A2506-9587-4DFF-ADC0-1D97798ABC8F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Ngrok", "src\CommunityToolkit.Aspire.Hosting.Ngrok\CommunityToolkit.Aspire.Hosting.Ngrok.csproj", "{84DCC422-2F8D-4309-A324-07E2C8C2EE8E}"
 EndProject
@@ -249,10 +239,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hos
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests", "tests\CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests\CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests.csproj", "{80CCC017-3821-4F7D-902C-BB71DE875F58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr", "src\CommunityToolkit.Aspire.Hosting.Dapr\CommunityToolkit.Aspire.Hosting.Dapr.csproj", "{2165F65B-83F2-4269-8781-86AB6ACF043D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.Tests", "tests\CommunityToolkit.Aspire.Hosting.Dapr.Tests\CommunityToolkit.Aspire.Hosting.Dapr.Tests.csproj", "{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr", "dapr", "{E3C2B4B7-B3B0-4E7F-A975-A6C7FD926792}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.AppHost", "examples\dapr\CommunityToolkit.Aspire.Hosting.Dapr.AppHost\CommunityToolkit.Aspire.Hosting.Dapr.AppHost.csproj", "{B81CEEE6-991E-418C-96D3-F831540C6DE1}"
@@ -359,6 +345,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hos
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdkProject", "examples\sql-database-projects\SdkProject\SdkProject.csproj", "{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dapr", "Dapr", "{41ACF613-EE5A-5900-F4D1-9FB713A32BE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.ApiService", "examples\dapr-azure\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.ApiService\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.ApiService.csproj", "{82E6321F-4CEF-4222-A003-7A3FBC778A66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.AppHost", "examples\dapr-azure\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.AppHost\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.AppHost.csproj", "{49D3094D-1462-48FC-A0CA-6EB9587FA0D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dapr", "Dapr", "{89078B53-6207-6E04-F939-AF96EA0F1B4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.Tests", "tests\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.Tests\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.Tests.csproj", "{583674A0-3FC4-4AC1-9583-45A67CAF6198}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr.Tests", "tests\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Tests\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Tests.csproj", "{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr.Tests", "tests\CommunityToolkit.Aspire.Hosting.Dapr.Tests\CommunityToolkit.Aspire.Hosting.Dapr.Tests.csproj", "{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr", "src\CommunityToolkit.Aspire.Hosting.Azure.Dapr\CommunityToolkit.Aspire.Hosting.Azure.Dapr.csproj", "{72652F7E-CFC0-4E3D-AD96-74C206A110BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis", "src\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis\CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.csproj", "{92D490BC-B953-45DC-8F9D-A992B2AEF96A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Dapr", "src\CommunityToolkit.Aspire.Hosting.Dapr\CommunityToolkit.Aspire.Hosting.Dapr.csproj", "{27144ED2-9F74-4A86-AABA-38CD061D8984}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -661,26 +667,6 @@ Global
 		{0761C6CF-28E8-FC0F-6AF3-213E4B312DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0761C6CF-28E8-FC0F-6AF3-213E4B312DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0761C6CF-28E8-FC0F-6AF3-213E4B312DD0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{022998DB-98FE-45EB-A145-DB0B1C12EEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{022998DB-98FE-45EB-A145-DB0B1C12EEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{022998DB-98FE-45EB-A145-DB0B1C12EEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{022998DB-98FE-45EB-A145-DB0B1C12EEE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8575F535-5E8A-49AB-BC2E-2A0417FB636B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8575F535-5E8A-49AB-BC2E-2A0417FB636B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8575F535-5E8A-49AB-BC2E-2A0417FB636B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8575F535-5E8A-49AB-BC2E-2A0417FB636B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{995804A3-7D89-4E0A-952E-A5A4161734F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{995804A3-7D89-4E0A-952E-A5A4161734F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{995804A3-7D89-4E0A-952E-A5A4161734F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{995804A3-7D89-4E0A-952E-A5A4161734F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC41302D-7E37-4703-A053-BF4097FF6B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC41302D-7E37-4703-A053-BF4097FF6B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC41302D-7E37-4703-A053-BF4097FF6B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC41302D-7E37-4703-A053-BF4097FF6B26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADF36205-629B-4822-99F3-88544F6B79CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADF36205-629B-4822-99F3-88544F6B79CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADF36205-629B-4822-99F3-88544F6B79CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADF36205-629B-4822-99F3-88544F6B79CA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84DCC422-2F8D-4309-A324-07E2C8C2EE8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84DCC422-2F8D-4309-A324-07E2C8C2EE8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84DCC422-2F8D-4309-A324-07E2C8C2EE8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -765,14 +751,6 @@ Global
 		{80CCC017-3821-4F7D-902C-BB71DE875F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80CCC017-3821-4F7D-902C-BB71DE875F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80CCC017-3821-4F7D-902C-BB71DE875F58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2165F65B-83F2-4269-8781-86AB6ACF043D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2165F65B-83F2-4269-8781-86AB6ACF043D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2165F65B-83F2-4269-8781-86AB6ACF043D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2165F65B-83F2-4269-8781-86AB6ACF043D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B81CEEE6-991E-418C-96D3-F831540C6DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B81CEEE6-991E-418C-96D3-F831540C6DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B81CEEE6-991E-418C-96D3-F831540C6DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -945,6 +923,38 @@ Global
 		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82E6321F-4CEF-4222-A003-7A3FBC778A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82E6321F-4CEF-4222-A003-7A3FBC778A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82E6321F-4CEF-4222-A003-7A3FBC778A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82E6321F-4CEF-4222-A003-7A3FBC778A66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49D3094D-1462-48FC-A0CA-6EB9587FA0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49D3094D-1462-48FC-A0CA-6EB9587FA0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49D3094D-1462-48FC-A0CA-6EB9587FA0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49D3094D-1462-48FC-A0CA-6EB9587FA0D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{583674A0-3FC4-4AC1-9583-45A67CAF6198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{583674A0-3FC4-4AC1-9583-45A67CAF6198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{583674A0-3FC4-4AC1-9583-45A67CAF6198}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{583674A0-3FC4-4AC1-9583-45A67CAF6198}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72652F7E-CFC0-4E3D-AD96-74C206A110BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72652F7E-CFC0-4E3D-AD96-74C206A110BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72652F7E-CFC0-4E3D-AD96-74C206A110BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72652F7E-CFC0-4E3D-AD96-74C206A110BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92D490BC-B953-45DC-8F9D-A992B2AEF96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92D490BC-B953-45DC-8F9D-A992B2AEF96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92D490BC-B953-45DC-8F9D-A992B2AEF96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92D490BC-B953-45DC-8F9D-A992B2AEF96A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27144ED2-9F74-4A86-AABA-38CD061D8984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27144ED2-9F74-4A86-AABA-38CD061D8984}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27144ED2-9F74-4A86-AABA-38CD061D8984}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27144ED2-9F74-4A86-AABA-38CD061D8984}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1041,11 +1051,6 @@ Global
 		{DE596B1A-B923-4D19-89B6-A361FA4EB5BF} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
 		{0761C6CF-28E8-FC0F-6AF3-213E4B312DD0} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
 		{914A2506-9587-4DFF-ADC0-1D97798ABC8F} = {8519CC01-1370-47C8-AD94-B0F326B1563F}
-		{022998DB-98FE-45EB-A145-DB0B1C12EEE5} = {914A2506-9587-4DFF-ADC0-1D97798ABC8F}
-		{8575F535-5E8A-49AB-BC2E-2A0417FB636B} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
-		{995804A3-7D89-4E0A-952E-A5A4161734F5} = {914A2506-9587-4DFF-ADC0-1D97798ABC8F}
-		{EC41302D-7E37-4703-A053-BF4097FF6B26} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
-		{ADF36205-629B-4822-99F3-88544F6B79CA} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
 		{84DCC422-2F8D-4309-A324-07E2C8C2EE8E} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
 		{7431DE02-23CA-4024-B22D-FCF008AFE3CB} = {8519CC01-1370-47C8-AD94-B0F326B1563F}
 		{FF2CE5E5-41C7-4BED-92EA-9F9FD8A7A444} = {7431DE02-23CA-4024-B22D-FCF008AFE3CB}
@@ -1070,8 +1075,6 @@ Global
 		{449B3661-A6F2-46D3-8EC9-B515362A72C1} = {2B0503E5-4FD5-4ED5-8AFA-8FC9609FCEC1}
 		{70A77931-7D25-4CBF-AE55-F5A3B932E9F8} = {2B0503E5-4FD5-4ED5-8AFA-8FC9609FCEC1}
 		{80CCC017-3821-4F7D-902C-BB71DE875F58} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
-		{2165F65B-83F2-4269-8781-86AB6ACF043D} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
-		{B2384D1A-DD13-4D03-B8FE-B194DEF71A0C} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
 		{E3C2B4B7-B3B0-4E7F-A975-A6C7FD926792} = {8519CC01-1370-47C8-AD94-B0F326B1563F}
 		{B81CEEE6-991E-418C-96D3-F831540C6DE1} = {E3C2B4B7-B3B0-4E7F-A975-A6C7FD926792}
 		{B9BEA97B-D722-4390-A34D-228AE7947E7C} = {E3C2B4B7-B3B0-4E7F-A975-A6C7FD926792}
@@ -1125,6 +1128,16 @@ Global
 		{C38B5A72-F717-4C7F-AB4C-54039A439D4D} = {A4E81DCC-B13D-4513-8933-E7E405439AE9}
 		{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
 		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE} = {4AE83D68-EA10-473D-BD26-19C5928A8620}
+		{41ACF613-EE5A-5900-F4D1-9FB713A32BE8} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
+		{82E6321F-4CEF-4222-A003-7A3FBC778A66} = {914A2506-9587-4DFF-ADC0-1D97798ABC8F}
+		{49D3094D-1462-48FC-A0CA-6EB9587FA0D5} = {914A2506-9587-4DFF-ADC0-1D97798ABC8F}
+		{89078B53-6207-6E04-F939-AF96EA0F1B4B} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
+		{583674A0-3FC4-4AC1-9583-45A67CAF6198} = {89078B53-6207-6E04-F939-AF96EA0F1B4B}
+		{C6A25DC4-8B30-4B46-BC68-0D4BC93423FD} = {89078B53-6207-6E04-F939-AF96EA0F1B4B}
+		{FD66E0B7-9737-4D6F-AFEB-70E83EC8A56F} = {89078B53-6207-6E04-F939-AF96EA0F1B4B}
+		{72652F7E-CFC0-4E3D-AD96-74C206A110BA} = {41ACF613-EE5A-5900-F4D1-9FB713A32BE8}
+		{92D490BC-B953-45DC-8F9D-A992B2AEF96A} = {41ACF613-EE5A-5900-F4D1-9FB713A32BE8}
+		{27144ED2-9F74-4A86-AABA-38CD061D8984} = {41ACF613-EE5A-5900-F4D1-9FB713A32BE8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {08B1D4B8-D2C5-4A64-BB8B-E1A2B29525F0}

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,6 +7,7 @@
     <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Dapr" Version="$(AspireVersion)" />
+		<PackageVersion Include="Aspire.Hosting.Azure.AppContainers" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.NodeJS" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(AspireVersion)" />