Aspire tweaks

elastic · Nov 22, 2024 · 9c0ae18 · 9c0ae18
1 parent c51e5e8
commit 9c0ae18
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
@@ -75,7 +75,10 @@ let private runTests suite _ =
         | Skip_E2E -> [ "--filter"; "FullyQualifiedName!~.EndToEndTests" ]        
 
     let settingsArg = ["-s"; "tests/.runsettings"]
-    let tfmArgs = if OS.Current = Windows then [] else if suite.Equals(E2E) then ["-f"; "net8.0"] else ["-f"; "net9.0"]
+    let tfmArgs = 
+      if OS.Current = Windows then [] 
+      elif suite.Equals(E2E) then ["-f"; "net8.0"]
+      else ["-f"; "net9.0"]
     exec {
         env (Map ["TEST_SUITE", suite.SuitName])
         run "dotnet" (

diff --git a/examples/AppHost/Properties/launchSettings.json b/examples/AppHost/Properties/launchSettings.json
@@ -1,15 +1,28 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17236;http://localhost:15173",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21045",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22093"
+      }
+    },
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:15114",
+      "applicationUrl": "http://localhost:15173",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16161"
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19153",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20247"
       }
     }
   }

diff --git a/examples/Example.AspNetCore.Mvc/Example.AspNetCore.Mvc.csproj b/examples/Example.AspNetCore.Mvc/Example.AspNetCore.Mvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

diff --git a/examples/ServiceDefaults/ServiceDefaults.csproj b/examples/ServiceDefaults/ServiceDefaults.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>

diff --git a/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs b/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs
@@ -170,5 +170,4 @@ internal static partial class LoggerMessages
 
 	[LoggerMessage(EventId = 4, Level = LogLevel.Information, Message = "Elastic defaults for {Signal} skipped, configured to be disabled")]
 	public static partial void LogDefaultsDisabled(this ILogger logger, string signal);
-
 }