From: Rob M. <ro...@us...> - 2009-02-20 13:47:55
|
Update of /cvsroot/wix/wix/src/WixUnit In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8853/src/WixUnit Modified Files: CandleUnit.cs LightUnit.cs LitUnit.cs WixUnit.cs unitTests.xsd Log Message: MiCarls: Native image custom action now handles the rollback disabled situation more appropriately, and no longer halts when a single file fails BobArnso: Fix SFBug:2613032 by adding XmlConfig to the list of Util extension elements. BobArnso: Fix SFBug:2613808 by letting failed SID lookups pass without failing the custom action. BobArnso: FixSFBug:2617847 with doc tweaks HeathS: Added support for PowerShell v2. EricStJ: Fix SFBUG:2600875 better error message when tool cannot be found. EricStJ: SFBUG: 2048669 - Fixing the TargetPath output of Wix build in MSBuild Feature: Adding .PCP as valid output type for Light. MiCarls: Fix SFBug:2609501 by refactoring (fix assert/memory issues in IIS CAs) - Also remove some dead code - Fix a dead MSDN link in the documentation BobArnso: Fix SFBug:2614701 by providing an error message; add better Id/Name defaults. EricStJ: SFBUG: 1675329 Fix dark to decompile ProgIds that don't have classes EricStJ: Fixing Setup.exe to use secure-at-source transforms instead of applying transform to database. Allows for transforms without invalidating authenticode signature. Index: LightUnit.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixUnit/LightUnit.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LightUnit.cs 24 Oct 2008 11:48:25 -0000 1.8 --- LightUnit.cs 20 Feb 2009 13:47:50 -0000 1.9 *************** *** 91,100 **** // handle extensions ! string[] suppressedExtensionArray = suppressExtensions.Split(';'); ! foreach (string extension in extensions.Split(';')) { ! if (0 > Array.BinarySearch(suppressedExtensionArray, extension)) { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); } } --- 91,103 ---- // handle extensions ! if (!String.IsNullOrEmpty(extensions)) { ! string[] suppressedExtensionArray = suppressExtensions.Split(';'); ! foreach (string extension in extensions.Split(';')) { ! if (0 > Array.BinarySearch(suppressedExtensionArray, extension)) ! { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); ! } } } Index: WixUnit.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixUnit/WixUnit.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WixUnit.cs 24 Oct 2008 11:48:26 -0000 1.10 --- WixUnit.cs 20 Feb 2009 13:47:50 -0000 1.11 *************** *** 438,442 **** XmlElement unitElement = (XmlElement)node; ! // add inherited attributes from the parent element foreach (XmlAttribute attribute in unitTestElement.ParentNode.Attributes) { --- 438,451 ---- XmlElement unitElement = (XmlElement)node; ! // add inherited attributes from the parent "UnitTest" element ! foreach (XmlAttribute attribute in unitTestElement.Attributes) ! { ! if (attribute.NamespaceURI.Length == 0) ! { ! unitElement.SetAttribute(attribute.Name, attribute.Value); ! } ! } ! ! // add inherited attributes from the grandparent "UnitTests" element foreach (XmlAttribute attribute in unitTestElement.ParentNode.Attributes) { Index: LitUnit.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixUnit/LitUnit.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LitUnit.cs 24 Oct 2008 11:48:26 -0000 1.2 --- LitUnit.cs 20 Feb 2009 13:47:50 -0000 1.3 *************** *** 56,62 **** // handle extensions ! foreach (string extension in extensions.Split(';')) { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); } --- 56,65 ---- // handle extensions ! if (!String.IsNullOrEmpty(extensions)) { ! foreach (string extension in extensions.Split(';')) ! { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); ! } } Index: CandleUnit.cs =================================================================== RCS file: /cvsroot/wix/wix/src/WixUnit/CandleUnit.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CandleUnit.cs 24 Oct 2008 11:48:25 -0000 1.3 --- CandleUnit.cs 20 Feb 2009 13:47:50 -0000 1.4 *************** *** 60,66 **** // handle extensions ! foreach (string extension in extensions.Split(';')) { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); } --- 60,69 ---- // handle extensions ! if (!String.IsNullOrEmpty(extensions)) { ! foreach (string extension in extensions.Split(';')) ! { ! commandLine.AppendFormat(" -ext \"{0}\"", extension); ! } } Index: unitTests.xsd =================================================================== RCS file: /cvsroot/wix/wix/src/WixUnit/unitTests.xsd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** unitTests.xsd 30 May 2008 07:22:41 -0000 1.7 --- unitTests.xsd 20 Feb 2009 13:47:50 -0000 1.8 *************** *** 166,169 **** --- 166,170 ---- <xs:element ref="WixProj" minOccurs="0" maxOccurs="unbounded" /> </xs:choice> + <xs:attribute name="Extensions" type="xs:string" /> <xs:attribute name="Name" type="xs:string" use="required" /> </xs:complexType> *************** *** 175,179 **** <xs:element ref="UnitTest" maxOccurs="unbounded" /> </xs:choice> - <xs:attribute name="Extensions" type="xs:string" use="required" /> <xs:attribute name="ToolsDirectory" type="xs:string" use="required" /> </xs:complexType> --- 176,179 ---- |