Merge pull request #34 from CZEMacLeod/fix-aspire-debuggerattached

Only default to attaching debugger if aspire itself is under debug.

Author: CZEMacLeod

samples/EF6/EF6/Extensions/WebObjectActivator.cs

@@ -22,7 +22,7 @@ public object GetService(Type serviceType)
         }
         if (serviceType == typeof(IKeyedServiceProvider))
         {
-            return serviceType as IKeyedServiceProvider ?? serviceProvider.GetService(serviceType);
+            return serviceProvider as IKeyedServiceProvider ?? serviceProvider.GetService(serviceType);
         }
         return serviceProvider.GetService(serviceType) ??
         Activator.CreateInstance(serviceType, flag, null, null, null);

src/C3D/Extensions/Aspire/IISExpress/IISExpressEntensions.cs

@@ -385,10 +385,10 @@ public static IResourceBuilder<IISExpressResource> AddIISExpress(this IDistribut
 
         builder.Services.AddSingleton<CommandExecutor>();
 
-        if (builder.Environment.IsDevelopment() && builder.ExecutionContext.IsRunMode)
-        {
-            builder.Services.AddAttachDebuggerHook();
-        }
+        //if (builder.Environment.IsDevelopment() && builder.ExecutionContext.IsRunMode)
+        //{
+        //    builder.Services.AddAttachDebuggerHook();
+        //}
 
         builder.Eventing.Subscribe<BeforeStartEvent>((@event, token) =>
         {
@@ -572,10 +572,10 @@ public static IDistributedApplicationBuilder AddIISExpressConfiguration(this IDi
             return Task.CompletedTask;
         });
 
-        if (builder.ExecutionContext.IsRunMode && builder.Environment.IsDevelopment())
-        {
-            builder.Services.AddAttachDebuggerHook();
-        }
+        //if (builder.ExecutionContext.IsRunMode && builder.Environment.IsDevelopment())
+        //{
+        //    builder.Services.AddAttachDebuggerHook();
+        //}
 
         return builder;
     }

src/C3D/Extensions/Aspire/VisualStudioDebug/Extensions/DebugResourceExtensions.cs

@@ -12,6 +12,7 @@ public static class DebugResourceBuilderExtensions
     public static bool IsDebugMode<TResource>(this IResourceBuilder<TResource> resourceBuilder, params string[]? environments)
         where TResource : IResource =>
             (resourceBuilder as IDebugBuilder<TResource>)?.IsDebugMode ?? (
+            System.Diagnostics.Debugger.IsAttached &&
             resourceBuilder.ApplicationBuilder.ExecutionContext.IsRunMode &&
             ((environments is null || environments.Length == 0) ?
                 resourceBuilder.ApplicationBuilder.Environment.IsDevelopment() :

src/C3D/Extensions/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <PackageOutputPath Condition="$(PackageOutputDir) == ''">$(MSBuildThisFileDirectory)..\nuget</PackageOutputPath>
+    <PackageOutputPath Condition="$(PackageOutputDir) == ''">$(MSBuildThisFileDirectory)..\..\..\nuget</PackageOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>

tests/OutputWatcherTestProject/Tests/OutputWatcherIntegrationTests.cs

@@ -1,12 +1,15 @@
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using Xunit.Abstractions;
 
 namespace OutputWatcherTestProject.Tests;
 
 public class OutputWatcherIntegrationTests(ITestOutputHelper outputHelper)
 {
     private void WriteFunctionName([CallerMemberName] string? caller = null) => outputHelper.WriteLine(caller);
+    private const int WaitForHealthyTimeoutSeconds = 90;
     private static readonly TimeSpan WaitForHealthyTimeout = TimeSpan.FromSeconds(90);
 
     private async Task<IDistributedApplicationTestingBuilder> CreateAppHostAsync()
@@ -18,6 +21,7 @@ private async Task<IDistributedApplicationTestingBuilder> CreateAppHostAsync()
         var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.AspireAppHostWaitForConsole>([], (dab, host) =>
         {
             dab.EnableResourceLogging = true;
+            host.Configuration!.AddUserSecrets<OutputWatcherIntegrationTests>();
         });
         appHost
             .Services
@@ -30,12 +34,12 @@ private async Task<IDistributedApplicationTestingBuilder> CreateAppHostAsync()
 
         appHost.Services.ConfigureHttpClientDefaults(clientBuilder =>
         {
-
+            var timeout = TimeSpan.FromSeconds(appHost.Configuration.GetValue<double>("HttpClientTimeout", 30));
             clientBuilder
                 .AddStandardResilienceHandler(res => {
-                    res.TotalRequestTimeout.Timeout = TimeSpan.FromSeconds(120);
-                    res.CircuitBreaker.SamplingDuration = TimeSpan.FromSeconds(60);
-                    res.AttemptTimeout.Timeout = TimeSpan.FromSeconds(30);
+                    res.TotalRequestTimeout.Timeout = timeout * 4;
+                    res.CircuitBreaker.SamplingDuration = timeout * 2;
+                    res.AttemptTimeout.Timeout = timeout;
                 });
             clientBuilder
                     .ConfigurePrimaryHttpMessageHandler(() =>