Menu
▾
▴
[WiX-commits] wix3.5/src/Votive/votive WixProjectReferenceNode.cs, 1.3, 1.4 WixProjectReferenceNodeProperties.cs, 1.3, 1.4 votive2010.common.targets, 1.4, 1.5
|
From: Rob M. <ro...@us...> - 2010-01-29 11:41:06
|
Update of /cvsroot/wix/wix3.5/src/Votive/votive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18774/src/Votive/votive Modified Files: WixProjectReferenceNode.cs WixProjectReferenceNodeProperties.cs votive2010.common.targets Log Message: JaredR: Added UX/Payload/PayloadGroup to Bundle language schema. Added Parsing for Payload/PayloadGroup(Ref) to Compiler. Added flattening of UX payloads to Linker. Added binding of UX payloads into output in Binder Added "just enough" of burnexe into Binder to start generation of bundle output (stub exe with attached UX container). JaredR: Created BurnWriter to replace SectionWriter and handle PE re-writing in safe code. Modified Binder to use BurnWriter for creating Bundles. Removed SectionWriter. Removed "Allow unsafe code" from Wix.csproj JaredR: Changed Bundle to require one UX element. Added simple Chain/MsiPackage/ExePackage to Bundle language schema. Updated Binder bundle code to generate chain/package information in Burn manifest and ParameterInfo to create a basic chainer. APaloma: Changed heat to use the new MSBuild API when harvesting VS 2010 projects. Fixed WiX projects being detected as non-MSBuildable in VS 2010. Fixed discrepancies between what projects were referenced in the new generated file and which ones heat actually generated authoring for. Fixed problems with missing or wrong project information being defined in project reference variables for VS 2010. Fixed build action not being changable on the property grid in VS 2010. Fixed heat generating Directory/@Name attributes containing "..". JaredR: Changed Bundle Chain to require one package element, and updated a failing unit test to include the now-required element. Refactored Binder.ChainPackageInfo.PackageType to Compiler.ChainPackageType so that hard-coded in order to remove some hard-coded strings. Changed Payload and *Package ID generation to use deterministic CompilerCore.GenerateIdentifier() method. Added end-to-end support for Variables in Bundles. CAraman: fixes for /W4 and static analysis APaloma: Added ability for heat to harvest projects to PayloadGroups. Added better error messages for when heat is unable to build targets in an MSBuild project when harvesting projects. Fixed heat generating Ids with invalid characters when project names contain characters that aren't valid for identifiers. APaloma: Added enforcing of valid identifer characters on ComponentGroup and ComponentGroupRef. MikeHo: Fix issue with DoesShareExist code, fix static analysis errors in IIS7 CAs APaloma: Added property for project references in Votive to completely disable automatic harvesting for a reference. APaloma: SFBUG:2940161 - Fixed heat generating ComponentGroups with duplicate Ids when using the -cg switch. MiCarls: Fix some issues found by static analysis MiCarls: Fix a scenario related to website locators, broken from previous fix RobMen: introduce buxutil.lib, Burn User Experience Utility library. Index: votive2010.common.targets =================================================================== RCS file: /cvsroot/wix/wix3.5/src/Votive/votive/votive2010.common.targets,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** votive2010.common.targets 1 Aug 2009 01:18:45 -0000 1.4 --- votive2010.common.targets 29 Jan 2010 11:40:26 -0000 1.5 *************** *** 201,205 **** <Visible>true</Visible> </Compile> ! <Compile Include="WixFileNodeNonMemberProperties.cs"> <Visible>true</Visible> </Compile> --- 201,205 ---- <Visible>true</Visible> </Compile> ! <Compile Include="..\votive2010\WixFileNodeNonMemberProperties.cs"> <Visible>true</Visible> </Compile> Index: WixProjectReferenceNode.cs =================================================================== RCS file: /cvsroot/wix/wix3.5/src/Votive/votive/WixProjectReferenceNode.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixProjectReferenceNode.cs 22 Jan 2010 10:05:12 -0000 1.3 --- WixProjectReferenceNode.cs 29 Jan 2010 11:40:26 -0000 1.4 *************** *** 75,78 **** --- 75,87 ---- /// <summary> + /// Gets or sets whether or not to harvest this referenced project. + /// </summary> + public bool Harvest + { + get { return String.IsNullOrEmpty(this.ItemNode.GetMetadata("DoNotHarvest")); } + set { this.ItemNode.SetMetadata("DoNotHarvest", value ? "" : "True"); } + } + + /// <summary> /// Gets or sets the output groups to be harvested from the referenced project. /// </summary> Index: WixProjectReferenceNodeProperties.cs =================================================================== RCS file: /cvsroot/wix/wix3.5/src/Votive/votive/WixProjectReferenceNodeProperties.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixProjectReferenceNodeProperties.cs 22 Jan 2010 10:05:12 -0000 1.3 --- WixProjectReferenceNodeProperties.cs 29 Jan 2010 11:40:26 -0000 1.4 *************** *** 187,190 **** --- 187,212 ---- /// <value>The project output groups to harvest.</value> [WixLocalizedCategory("HarvestCategory")] + [WixLocalizedDisplayName("RefHarvest")] + [WixLocalizedDescription("RefHarvestDescription")] + [Browsable(true)] + [AutomationBrowsable(true)] + public bool RefHarvest + { + get + { + return ((WixProjectReferenceNode)this.Node).Harvest; + } + + set + { + ((WixProjectReferenceNode)this.Node).Harvest = value; + } + } + + /// <summary> + /// Gets or sets the project output groups to harvest. + /// </summary> + /// <value>The project output groups to harvest.</value> + [WixLocalizedCategory("HarvestCategory")] [WixLocalizedDisplayName("RefProjectOutputGroups")] [WixLocalizedDescription("RefProjectOutputGroupsDescription")] |