Index: Externals/Eagle/lib/Test1.0/constraints.eagle ================================================================== --- Externals/Eagle/lib/Test1.0/constraints.eagle +++ Externals/Eagle/lib/Test1.0/constraints.eagle @@ -2740,10 +2740,30 @@ $::test_visual_studio "\")\n"] } else { tputs $channel no\n } } + + proc checkForNativeDebugger { channel } { + tputs $channel "---- checking for native debugger... " + + # + # NOTE: Is the native debugger present? + # + if {[catch {object invoke -flags +NonPublic \ + Eagle._Components.Private.NativeOps+SafeNativeMethods \ + IsDebuggerPresent} present] == 0 && $present} then { + # + # NOTE: Yes, it appears that it is present. + # + addConstraint nativeDebugger + + tputs $channel yes\n + } else { + tputs $channel no\n + } + } proc checkForManagedDebugger { channel } { tputs $channel "---- checking for managed debugger... " # Index: Externals/Eagle/lib/Test1.0/prologue.eagle ================================================================== --- Externals/Eagle/lib/Test1.0/prologue.eagle +++ Externals/Eagle/lib/Test1.0/prologue.eagle @@ -1767,10 +1767,17 @@ # # NOTE: For test "object-4.10". # checkForWix $test_channel } + + # + # NOTE: Has native debugger testing support been disabled? + # + if {![info exists no(nativeDebugger)]} then { + checkForNativeDebugger $test_channel + } # # NOTE: Has managed debugger testing support been disabled? # if {![info exists no(managedDebugger)]} then { Index: tools/install/Installer.cs ================================================================== --- tools/install/Installer.cs +++ tools/install/Installer.cs @@ -4512,12 +4512,13 @@ rootKey, frameworkName, frameworkVersion, platformName, perUser, wow64, whatIf, verbose)) { TraceOps.DebugAndTrace(TracePriority.Low, debugCallback, traceCallback, String.Format( - ".NET Framework v{0} directory not found, " + - "skipping...", frameworkVersion), traceCategory); + ".NET Framework {0} directory not found, " + + "skipping...", ForDisplay(frameworkVersion)), + traceCategory); continue; } if (callback == null) @@ -4709,12 +4710,13 @@ rootKey, frameworkName, frameworkVersion, platformName, perUser, wow64, whatIf, verbose)) { TraceOps.DebugAndTrace(TracePriority.Low, debugCallback, traceCallback, String.Format( - ".NET Framework v{0} registry not found, " + - "skipping...", frameworkVersion), traceCategory); + ".NET Framework {0} registry not found, " + + "skipping...", ForDisplay(frameworkVersion)), + traceCategory); continue; } if (callback == null) @@ -4878,12 +4880,12 @@ rootKey, vsVersion, suffix, perUser, wow64, whatIf, verbose)) { TraceOps.DebugAndTrace(TracePriority.Low, debugCallback, traceCallback, String.Format( - "Visual Studio v{0} not found, skipping...", - vsVersion), traceCategory); + "Visual Studio {0} not found, skipping...", + ForDisplay(vsVersion)), traceCategory); continue; } if (callback == null)