Update Aspire to GA and Telerik to 2024 Q2

LanceMcCarthy · May 22, 2024 · f8fadec · f8fadec
1 parent e6636f3
commit f8fadec
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 14 deletions.
diff --git a/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj b/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj
@@ -7,9 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telerik.Drawing.Skia" Version="18.0.24.305" />
-    <PackageReference Include="Telerik.Reporting.OpenXmlRendering" Version="18.0.24.305" />
-    <PackageReference Include="Telerik.Reporting.Services.AspNetCore" Version="18.0.24.305" />
+    <PackageReference Include="Aspire.Hosting.Seq" Version="8.0.1" />
+    <PackageReference Include="Aspire.Seq" Version="8.0.1" />
+    <PackageReference Include="Telerik.Drawing.Skia" Version="18.1.24.514" />
+    <PackageReference Include="Telerik.Reporting.OpenXmlRendering" Version="18.1.24.514" />
+    <PackageReference Include="Telerik.Reporting.Services.AspNetCore" Version="18.1.24.514" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DevCraftAspire.ApiService/Program.cs b/DevCraftAspire.ApiService/Program.cs
@@ -8,6 +8,9 @@
 // Comes from ServiceDefaults project's extensions
 builder.AddServiceDefaults();
 
+// For traces
+builder.AddSeqEndpoint("seq");
+
 // Add services to the container.
 builder.Services.AddProblemDetails();
 
@@ -50,10 +53,10 @@
 app.MapDefaultEndpoints();
 
 // Temporary for debugging ApiService file access
-#if RELEASE
-var logFilePath = "/home/app/_traceoutput.log";
-System.Diagnostics.Trace.Listeners.Add(new System.Diagnostics.TextWriterTraceListener());
-System.Diagnostics.Trace.AutoFlush = true;
-#endif
+//#if RELEASE
+//var logFilePath = "/home/app/_traceoutput.log";
+//System.Diagnostics.Trace.Listeners.Add(new System.Diagnostics.TextWriterTraceListener());
+//System.Diagnostics.Trace.AutoFlush = true;
+//#endif
 
 app.Run();
diff --git a/DevCraftAspire.AppHost/DevCraftAspire.AppHost.csproj b/DevCraftAspire.AppHost/DevCraftAspire.AppHost.csproj
@@ -15,8 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0-preview.7.24251.11" />
-    <PackageReference Include="Aspire.Hosting.Redis" Version="8.0.0-preview.7.24251.11" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.1" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="8.0.1" />
+    <PackageReference Include="Aspire.Hosting.Seq" Version="8.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/DevCraftAspire.AppHost/Program.cs b/DevCraftAspire.AppHost/Program.cs
@@ -2,12 +2,16 @@
 
 var cache = builder.AddRedis("cache");
 
+var seq = builder.AddSeq("seq");
+
 var apiService = builder.AddProject<Projects.DevCraftAspire_ApiService>("apiservice")
+    .WithReference(seq)
     .WithExternalHttpEndpoints();
 
 builder.AddProject<Projects.DevCraftAspire_Web>("webfrontend")
     .WithReference(cache)
     .WithReference(apiService)
+    .WithReference(seq)
     .WithExternalHttpEndpoints();
 
 builder.Build().Run();
diff --git a/DevCraftAspire.ServiceDefaults/DevCraftAspire.ServiceDefaults.csproj b/DevCraftAspire.ServiceDefaults/DevCraftAspire.ServiceDefaults.csproj
@@ -11,14 +11,14 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.4.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0-preview.7.24251.11" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
   </ItemGroup>
 
 </Project>
diff --git a/DevCraftAspire.Web/DevCraftAspire.Web.csproj b/DevCraftAspire.Web/DevCraftAspire.Web.csproj
@@ -16,7 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="8.0.0-preview.7.24251.11" />
+    <PackageReference Include="Aspire.Hosting.Seq" Version="8.0.1" />
+    <PackageReference Include="Aspire.Seq" Version="8.0.1" />
+    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="8.0.1" />
     <PackageReference Include="Telerik.ReportViewer.Blazor" Version="18.1.24.514" />
     <PackageReference Include="Telerik.UI.for.Blazor" Version="6.0.0" />
   </ItemGroup>

diff --git a/DevCraftAspire.Web/Program.cs b/DevCraftAspire.Web/Program.cs
@@ -5,6 +5,11 @@
 
 // Add service defaults & Aspire components.
 builder.AddServiceDefaults();
+
+// For traces
+builder.AddSeqEndpoint("seq");
+
+// For caching
 builder.AddRedisOutputCache("cache");
 
 // Add services to the container.