Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Better support debugging the VS designer component installer. Also, make sure the unit testing log has the full trace output of the VS designer component installer. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
8354eb7c694ef2eccdda2838c883f9ad |
| User & Date: | mistachkin 2012-01-27 23:19:57 |
Context
|
2012-01-27
| ||
| 23:44 | Version and doc updates for release 1.0.79.0. check-in: b5c2643cdc user: mistachkin tags: trunk | |
| 23:19 | Better support debugging the VS designer component installer. Also, make sure the unit testing log has the full trace output of the VS designer component installer. check-in: 8354eb7c69 user: mistachkin tags: trunk | |
| 19:35 | Correct the resource name for the LINQ assembly. Fix for ticket [fbebb30da9]. check-in: b793978ba9 user: mistachkin tags: trunk | |
Changes
Changes to Tests/installer.eagle.
75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 ... 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 ... 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ... 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install true -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install false -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install true -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install false -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
|
| | | | |
75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 ... 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 ... 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ... 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install true -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"] -debug true
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install false -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"] -debug true
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install true -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"] -debug true
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
................................................................................
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install false -wow64 true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"] -debug true
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
set wow64 [expr {[haveConstraint amd64.64bit] ? "\\Wow6432Node" : ""}]
|
Changes to tools/install/Installer.cs.
2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 .... 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 .... 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 .... 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 |
traceCategory);
TraceOps.DebugAndTrace(TracePriority.MediumLow,
debugCallback, traceCallback, String.Format(
"Original command line is: {0}",
Environment.CommandLine), traceCategory);
if (!configuration.whatIf)
{
//
// NOTE: If the debugger is attached and What-If mode
// is [now] disabled, issue a warning.
//
if (Debugger.IsAttached)
................................................................................
if (String.IsNullOrEmpty(directory))
return false;
if (!Directory.Exists(directory))
return false;
return true;
}
}
///////////////////////////////////////////////////////////////////////
[MethodImpl(MethodImplOptions.NoInlining)]
................................................................................
string directory = (string)value;
if (String.IsNullOrEmpty(directory))
return false;
if (!Directory.Exists(directory))
return false;
return true;
}
}
///////////////////////////////////////////////////////////////////////
................................................................................
string[] args
)
{
try
{
Configuration configuration = null;
string error = null;
///////////////////////////////////////////////////////////////
#region Command Line Processing
if (!Configuration.FromArgs(
args, true, ref configuration, ref error) ||
!Configuration.Process(
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 .... 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 .... 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 .... 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 |
traceCategory);
TraceOps.DebugAndTrace(TracePriority.MediumLow,
debugCallback, traceCallback, String.Format(
"Original command line is: {0}",
Environment.CommandLine), traceCategory);
TraceOps.DebugAndTrace(TracePriority.MediumLow,
debugCallback, traceCallback, String.Format(
"Running process is {0}.", Is64BitProcess() ?
"64-bit" : "32-bit"), traceCategory);
if (!configuration.whatIf)
{
//
// NOTE: If the debugger is attached and What-If mode
// is [now] disabled, issue a warning.
//
if (Debugger.IsAttached)
................................................................................
if (String.IsNullOrEmpty(directory))
return false;
if (!Directory.Exists(directory))
return false;
TraceOps.DebugAndTrace(TracePriority.Lower,
debugCallback, traceCallback, String.Format(
".NET Framework {0} found in directory {1}.",
ForDisplay(frameworkVersion), ForDisplay(directory)),
traceCategory);
return true;
}
}
///////////////////////////////////////////////////////////////////////
[MethodImpl(MethodImplOptions.NoInlining)]
................................................................................
string directory = (string)value;
if (String.IsNullOrEmpty(directory))
return false;
if (!Directory.Exists(directory))
return false;
TraceOps.DebugAndTrace(TracePriority.Lower,
debugCallback, traceCallback, String.Format(
"Visual Studio {0} found in directory {1}.",
ForDisplay(vsVersion), ForDisplay(directory)),
traceCategory);
return true;
}
}
///////////////////////////////////////////////////////////////////////
................................................................................
string[] args
)
{
try
{
Configuration configuration = null;
string error = null;
///////////////////////////////////////////////////////////////
#region Debugger Hook
if (Environment.GetEnvironmentVariable("Break") != null)
{
Console.WriteLine(
"Attach a debugger to process {0} and " +
"press any key to continue.",
Process.GetCurrentProcess().Id);
try
{
Console.ReadKey(true); /* throw */
}
catch (InvalidOperationException) // Console.ReadKey
{
// do nothing.
}
Debugger.Break();
}
#endregion
///////////////////////////////////////////////////////////////
#region Command Line Processing
if (!Configuration.FromArgs(
args, true, ref configuration, ref error) ||
!Configuration.Process(
|