Revert "Update to Aspire 9.5 (dotnet#900)"

This reverts commit 1b2698c.

Author: Petr Rudzenkou

Directory.Packages.props

@@ -4,8 +4,8 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <AspnetVersion>10.0.0-preview.7.25380.108</AspnetVersion>
     <MicrosoftExtensionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsVersion>
-    <AspireVersion>9.5.0</AspireVersion>
-    <AspireUnstablePackagesVersion>9.5.0-preview.1.25474.7</AspireUnstablePackagesVersion>
+    <AspireVersion>9.4.2</AspireVersion>
+    <AspireUnstablePackagesVersion>9.4.2-preview.1.25428.12</AspireUnstablePackagesVersion>
     <GrpcVersion>2.71.0</GrpcVersion>
     <DuendeVersion>7.3.1</DuendeVersion>
     <ApiVersioningVersion>8.1.0</ApiVersioningVersion>
@@ -57,8 +57,6 @@
     <PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.2" />
     <!-- Version together with runtime -->
     <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
     <!-- Xabaril packages -->
     <PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
     <!-- AI -->

src/WebApp/Extensions/Extensions.cs

@@ -31,11 +31,11 @@ public static void AddApplicationServices(this IHostApplicationBuilder builder)
         builder.Services.AddGrpcClient<Basket.BasketClient>(o => o.Address = new("http://basket-api"))
             .AddAuthToken();
 
-        builder.Services.AddHttpClient<CatalogService>(o => o.BaseAddress = new("https+http://catalog-api"))
+        builder.Services.AddHttpClient<CatalogService>(o => o.BaseAddress = new("http://catalog-api"))
             .AddApiVersion(2.0)
             .AddAuthToken();
 
-        builder.Services.AddHttpClient<OrderingService>(o => o.BaseAddress = new("https+http://ordering-api"))
+        builder.Services.AddHttpClient<OrderingService>(o => o.BaseAddress = new("http://ordering-api"))
             .AddApiVersion(1.0)
             .AddAuthToken();
     }

src/eShop.AppHost/Extensions.cs

@@ -66,7 +66,6 @@ public static IDistributedApplicationBuilder AddOpenAI(this IDistributedApplicat
                     .WithDescription("The Azure OpenAI endpoint to use, e.g. https://<name>.openai.azure.com/")
                     .WithCustomInput(p => new()
                     {
-                        Name = "OpenAIEndpointParameter",
                         Label = "Azure OpenAI Endpoint",
                         InputType = InputType.Text,
                         Value = "https://<name>.openai.azure.com/",
@@ -80,7 +79,6 @@ public static IDistributedApplicationBuilder AddOpenAI(this IDistributedApplicat
                     .WithDescription("The OpenAI API key to use.")
                     .WithCustomInput(p => new()
                     {
-                        Name = "OpenAIKeyParameter",
                         Label = "API Key",
                         InputType = InputType.SecretText
                     });
@@ -90,7 +88,6 @@ public static IDistributedApplicationBuilder AddOpenAI(this IDistributedApplicat
                 .WithDescription("The chat model to use.")
                 .WithCustomInput(p => new()
                 {
-                    Name = "ChatModelParameter",
                     Label = "Chat Model",
                     InputType = InputType.Text,
                     Value = chatModelName,
@@ -100,7 +97,6 @@ public static IDistributedApplicationBuilder AddOpenAI(this IDistributedApplicat
                 .WithDescription("The embedding model to use.")
                 .WithCustomInput(p => new()
                 {
-                    Name = "EmbeddingModelParameter",
                     Label = "Text Embedding Model",
                     InputType = InputType.Text,
                     Value = textEmbeddingModelName,

src/eShop.AppHost/eShop.AppHost.csproj

@@ -1,5 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>

tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>