Index: Tests/installer.eagle ================================================================== --- Tests/installer.eagle +++ Tests/installer.eagle @@ -72,13 +72,13 @@ } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ - -success 0] -debugPriority Lowest -tracePriority High -install true \ + -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \ - -whatIf true -verbose true -confirm true \ + -whatIf true -verbose true -confirm true -install true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -104,13 +104,13 @@ } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ - -success 0] -debugPriority Lowest -tracePriority High -install false \ + -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \ - -whatIf true -verbose true -confirm true \ + -whatIf true -verbose true -confirm true -install false \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -136,13 +136,13 @@ } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ - -success 0] -debugPriority Lowest -tracePriority High -install true \ + -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \ - -whatIf true -verbose true -confirm true \ + -whatIf true -verbose true -confirm true -install true \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" @@ -168,13 +168,13 @@ } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ - -success 0] -debugPriority Lowest -tracePriority High -install false \ + -success 0] -debugPriority Lowest -tracePriority MediumHigh \ -noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \ - -whatIf true -verbose true -confirm true \ + -whatIf true -verbose true -confirm true -install false \ -logFileName [appendArgs \" [file nativename $fileName] \"] \ -traceFormat [appendArgs \" "#{0}: {2}" \"] } error] tlog "---- BEGIN STDOUT OUTPUT\n" Index: tools/install/Installer.cs ================================================================== --- tools/install/Installer.cs +++ tools/install/Installer.cs @@ -96,14 +96,16 @@ { None = 0x0, Lowest = 0x1, Lower = 0x2, Low = 0x4, - Medium = 0x8, - High = 0x10, - Higher = 0x20, - Highest = 0x40, + MediumLow = 0x8, + Medium = 0x10, + MediumHigh = 0x20, + High = 0x40, + Higher = 0x80, + Highest = 0x100, Default = Medium } #endregion /////////////////////////////////////////////////////////////////////////// @@ -2666,16 +2668,16 @@ // NOTE: Show where we are running from and how we were // invoked. // string location = assembly.Location; - TraceOps.DebugAndTrace(TracePriority.Medium, + TraceOps.DebugAndTrace(TracePriority.MediumLow, debugCallback, traceCallback, String.Format( "Running executable is: {0}", ForDisplay(location)), traceCategory); - TraceOps.DebugAndTrace(TracePriority.Medium, + TraceOps.DebugAndTrace(TracePriority.MediumLow, debugCallback, traceCallback, String.Format( "Original command line is: {0}", Environment.CommandLine), traceCategory); if (!configuration.whatIf) @@ -2683,18 +2685,18 @@ // // NOTE: If the debugger is attached and What-If mode // is [now] disabled, issue a warning. // if (Debugger.IsAttached) - TraceOps.DebugAndTrace(TracePriority.Medium, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Forced to disable \"what-if\" mode with " + "debugger attached.", traceCategory); } else { - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "No actual changes will be made to this " + "system because \"what-if\" mode is enabled.", traceCategory); } @@ -3754,12 +3756,12 @@ if (!Directory.Exists(directory)) { TraceOps.DebugAndTrace(TracePriority.Low, debugCallback, traceCallback, String.Format( - ".NET Framework {0} directory {1} does not exist, " + - "skipping...", ForDisplay(frameworkVersion), + ".NET Framework {0} directory {1} does not " + + "exist, skipping...", ForDisplay(frameworkVersion), ForDisplay(directory)), traceCategory); continue; } @@ -5167,11 +5169,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5295,11 +5297,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5325,11 +5327,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5351,11 +5353,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5377,11 +5379,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5403,11 +5405,11 @@ TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Failure.", traceCategory); return 1; /* FAILURE */ } @@ -5415,11 +5417,11 @@ #endregion /////////////////////////////////////////////////////////// #region Log Summary - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, String.Format( "subKeysCreated = {0}, subKeysDeleted = {1}, " + "keyValuesSet = {2}, keyValuesDeleted = {3}", ForDisplay(RegistryHelper.SubKeysCreated), ForDisplay(RegistryHelper.SubKeysDeleted), @@ -5428,11 +5430,11 @@ traceCategory); #endregion /////////////////////////////////////////////////////////// - TraceOps.DebugAndTrace(TracePriority.High, + TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Success.", traceCategory); return 0; /* SUCCESS */ }