From: Rob M. <ro...@us...> - 2009-05-22 11:07:33
|
Update of /cvsroot/wix/wix/test/src/Tools/Light In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3912/test/src/Tools/Light Modified Files: Help.HelpTests.cs Log Message: BobArnso: Fix SFBug:2792525 - Missing punctuation in WixUI_en-us.wxs AaronSte: Remove VS WiX detection and blocking logic from WiX setup. EricStJ: SFBUG:2792176 - Do not use ConvertToAbsolutePath. BobArnso: Re-fix SFBug:2786736 - Conditionalize for MSBuild 2.0 gold in addition to 2.0 SPx and 3.5 EricStJ: SFBUG:2777114 - Replacing TargetPath and TargetPdbPath with tokens to enable delayed expansion of the properties. Modifying votive to use the tokens. Index: Help.HelpTests.cs =================================================================== RCS file: /cvsroot/wix/wix/test/src/Tools/Light/Help.HelpTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Help.HelpTests.cs 9 Jan 2009 08:45:31 -0000 1.2 --- Help.HelpTests.cs 22 May 2009 11:07:25 -0000 1.3 *************** *** 54,59 **** light.ExpectedOutputStrings.Add(" (default: %NUMBER_OF_PROCESSORS%)"); light.ExpectedOutputStrings.Add("-cub <file.cub> additional .cub file containing ICEs to run"); ! light.ExpectedOutputStrings.Add("-cultures:<cultures> semicolon-delimited list of localized string cultures"); ! light.ExpectedOutputStrings.Add(" to load from libraries"); light.ExpectedOutputStrings.Add("-d<name>[=<value>] define a wix variable, with or without a value."); light.ExpectedOutputStrings.Add(" -dcl:level set default cabinet compression level"); --- 54,60 ---- light.ExpectedOutputStrings.Add(" (default: %NUMBER_OF_PROCESSORS%)"); light.ExpectedOutputStrings.Add("-cub <file.cub> additional .cub file containing ICEs to run"); ! light.ExpectedOutputStrings.Add("-cultures:<cultures> semicolon or comma delimited list of localized"); ! light.ExpectedOutputStrings.Add(" string cultures to load from .wxl files and libraries."); ! light.ExpectedOutputStrings.Add(" Precedence of cultures is from left to right."); light.ExpectedOutputStrings.Add("-d<name>[=<value>] define a wix variable, with or without a value."); light.ExpectedOutputStrings.Add(" -dcl:level set default cabinet compression level"); |