Commit Graph
30 Commits
Author SHA1 Message Date
Marek Safar 93e590439c [xbuild] Resolve output properties for skipped task to match task output when it's not skipped 2014-08-22 09:24:40 +02:00
Andres G. Aragoneses b6c3382596 Microsoft.Build.Engine: Remove deprecated NET_2_0 conditionals 2012-09-15 18:06:34 +01:00
Alan McGovern 961e2cf4ad [Xbuild] Use OrdinalIgnoreCase not InvariantCultureIgnoreCase
It's chewing up a fair bit of CPU time and buys us nothing. We only care
about ordinal ignore case for these scenarios.
2012-06-30 18:55:38 -04:00
Ankit Jain 616efc5cd7 [xbuild] Remove property if Output TaskParameter is null.
If the TaskParameter for Output of a task is null, then remove
the corresponding property.
Add relevant test.
2011-02-28 03:10:14 +05:30
Ankit Jain 5cb32413f9 [xbuild] Fix 635767. Support enums for task property Outputs.
Add support for task properties to be enums, when publishing
Output.
2010-08-31 17:13:20 +05:30
Ankit Jain 0773d1c0df In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* TaskEngine.cs (Prepare): Throw InvalidProjectFileException instead of a generic
	Exception.

In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks:
	* Copy.cs: Cleanly log errors, instead of throwing exceptions.

svn path=/trunk/mcs/; revision=155187
2010-04-10 00:05:05 +00:00
Ankit Jain 279a0639a4 In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* TaskBatchingImpl.cs (ParseTaskAttributes): Parse attributes
	of the 'Output' element also.
	* TaskEngine.cs (PublishOutput): Honor condition on 'Output' also.

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* ProjectTest.cs (TestBatchedMetadataRefInOutput): New.

svn path=/trunk/mcs/; revision=143723
2009-10-07 22:48:26 +00:00
Ankit Jain 64b342c4e8 In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* Expression.cs (ParseOptions): New enum. Replace the bool params
	of exression.Parse with this. Add option to control expansion of
	metadata references.
	(CopyToExpressionCollection): Track api changes.

	Update all expr.Parse calls to use the new enum.
	* BuildItem.cs, BuildProperty.cs, BuildTask.cs, Import.cs,
	Target.cs, TargetBatchingImpl.cs, UsingTask.cs: Track api changes.

	* BatchingImplBase.cs: Track api changes. Allow metadata refs
	in task attributes.
	* ConditionFactorExpression.cs: Allow metadata refs in conditions.
	* ItemReference.cs: Allow metadata in transforms.
	* TaskEngine.cs: Allow metadata refs.

	* MetadataReference.cs (.ctor): Add a 'original string' param.

In class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks:

	* TaskBatchingTest.cs: Add new tests for metadata refs found
	in places other than task attributes.

svn path=/trunk/mcs/; revision=140998
2009-09-01 04:00:38 +00:00
Ankit Jain 2f3d65b5c3 In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* Expression.cs (ExpressionOptions): New.

	Introduce a ExpressionOptions argument to all ConvertTo*
	methods. Implement the rule: in evaluation phase, expand
	all items completely, but dont expand item refs in properties.
	At other times, expand the item refs in the properties.
	See comments in Expression.cs, for a full explanation.
	* BuildItem.cs: Track api changes.
	* BuildItemGroup.cs: Likewise.
	* BuildProperty.cs: Track api changes. Handle self-references.
	* BuildTask.cs: Track api changes.
	* IReference.cs: Add ExpressionOptions param.
	* ItemReference.cs: Track api changes.
	* PropertyReference.cs: Likewise.
	* MetadataReference.cs: Likewise.
	* ExpressionCollection.cs: Track api changes. Add support for
	converting all primitive types and DateTime, instead of a fixed
	few.
	* Project.cs (GetMetadataBatched): Use the evaluated metadata.
	* TaskBatchingImpl.cs: Handle the case when batching is required,
	but no items are available.

	* TaskEngine.cs: Throw on unsupported types. Correctly handle
	properties in case of empty values.

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* BuildItemTest.cs (TestSetMetadata5a): New.
	* ProjectTest.cs: Add tests for different property types
	with required attribute. Also, check the values - null or
	empty array.
	* TestTasks.cs: Add new tasks for above.

In class/Microsoft.Build.Engine/Test/resources:

	* TestTasks.cs: Add new tasks for different property types
	with required attribute. Also, emit whether the value was
	null or a zero length array.

In class/Microsoft.Build.Engine/Test/various:

	* Items.cs: Add tests for property/item evaluation.

svn path=/trunk/mcs/; revision=140911
2009-08-28 21:55:29 +00:00
Ankit Jain 68037b2d56 In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* BatchingImplBase.cs: Make the item name lookups and metadata be case
	insensitive.
	* TaskDatabase.cs: Likewise.
	* TaskEngine.cs: Make property name looks, case insensitive.

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* ProjectTest.cs (TestCaseSensitivityOfProjectElements): New.

svn path=/trunk/mcs/; revision=140153
2009-08-18 11:57:52 +00:00
Ankit Jain 16bd64b93b * TaskEngine.cs (Prepare): Fix formatting mistake.
* ConsoleLogger.cs: Emit "-- FAILED" also when project/target building
fails. Also, emit result of project at Normal verbosity level.

svn path=/trunk/mcs/; revision=138897
2009-07-28 23:35:44 +00:00
Ankit Jain c435e556d8 * TaskEngine.cs (Prepare): Emit a useful error message property value
can't be converted to required type.

svn path=/trunk/mcs/; revision=132721
2009-04-27 11:41:38 +00:00
Ankit Jain 0e7783175b In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* TaskEngine.cs (GetObjectFromString): Empty value is allowed only for
	arrays.

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* ProjectTest.cs (TestRequiredTask_*): New.
	(TestBatchedMetadataRef5): New.

In class/Microsoft.Build.Engine/Test/resources:

	* TestTasks.cs (RequiredTestTask): Rename to ..
	(RequiredTestTask_TaskItems): .. this.
	(RequiredTestTask_*): New types.

svn path=/trunk/mcs/; revision=125076
2009-01-30 12:27:45 +00:00
Ankit Jain 8657a158fb In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
* BuildItem.cs (child_items): Change type from BuildItemGroup to
	List<BuildItem>.
	(HasParent): Rename to ..
	(HasParentItem): .. this.
	(ParentItemGroup): Add setter.

	* BuildItemGroup.cs (.ctor): Add overload with @project param.
	(AddNewItem):
	(AddItem): Correctly set the ParentItemGroup for new build items.
	(ParentProject): Add setter.
	* Project.cs: Set the project for new BuildItemGroup instances.
	* TaskEngine.cs (PublishItemGroup): Likewise.

In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:

	* BuildItemTest.cs (TestBuildItemTransform): New.

In class/Microsoft.Build.Engine/Test/resources:

	* TestTasks.cs (BatchingTestTask.TaskItemsOutput): New.

svn path=/trunk/mcs/; revision=124840
2009-01-28 20:05:01 +00:00
Ankit Jain 0b9db4baca Improve expression parsing, esp for concat'ing expressions.
In class/Microsoft.Build.Engine:

	* Microsoft.Build.Engine.dll.sources: Add IReference.cs

In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:

	* IReference.cs: New. Interface for Item/Metadata/PropertyReference.
	* ChangeType (ToBuildItemGroup): Add 'split' param.
	Track api changes.
	* Expression.cs (Parse): Add a new overload with a 'split' param.
	* ExpressionCollection.cs (Add): Add new overload for IReference,
	remove the ones for Item/Metadata/PropertyReference.
	(ConvertToArray): Implement correctly.
	(ConvertToString): Track api changes.
	(ConvertToITaskItem): Implement with ConvertToITaskItemArray.
	(ConvertToITaskItemArray): Implement support for concat'ing expressions.
	(AddItemsToArray): New.
	(ConvertToITaskItemArrayFromString): Refactor a bit.
	(ThrowCantConcatError): New.
	* ItemReference.cs: Update.
	* MetadataReference.cs: Update.
	* PropertyReference.cs (ConvertToITaskItemArray): Implement.
	(GetValue): New.
	* BuildPropertyGroup.cs: Track api changes.
	* TaskEngine.cs (PublishOutput): Improve exception message.
	* Project.cs (DoLoad): Improve exception message. Add a null check.

In class/Microsoft.Build.Engine/Test/various:

	* Items.cs: Add tests for expression parsing, mainly for concat'ing
	expressions. Remove "NotWorking" for some tests that are working now.

svn path=/trunk/mcs/; revision=122310
2009-01-01 08:38:13 +00:00
Ankit Jain 70e34156f1 Added support for batching.
svn path=/trunk/mcs/; revision=119570
2008-11-21 02:40:13 +00:00
Marek Sieradzki 0c8f422160 2007-03-05 Marek Sieradzki <[email protected]>
* TaskEngine.cs, ChangeType.cs: Moved Collect* to ChangeType and
        simplified. It still needs tests and refactoring.


svn path=/trunk/mcs/; revision=73752
2007-03-05 21:16:24 +00:00
Marek Sieradzki f92b1040d8 2007-02-18 Marek Sieradzki <[email protected]>
* ExpressionCollection.cs (ConvertToITaskItemArrayFromString):
		Simplified.

	* ConditionFunctionExpression.cs: Removed warnings.

	* BuildTask.cs (Execute): Write exceptions to std err (they should be
	       logged but it's better than swallowing).



svn path=/trunk/mcs/; revision=73072
2007-02-18 13:04:26 +00:00
Marek Sieradzki 4b6c9514dc 2007-01-23 Marek Sieradzki <[email protected]>
* BuildTask.cs, ConditionFactorExpression.cs, Target.cs,
        TaskEngine.cs, UsingTask.cs, ItemReference.cs, BuildItem.cs,
        BatchingImpl.cs, BuildProperty.cs: Track API changes.

        * Expression.cs (Parse): Added allowItems parameter and made regexes
        static.

        * Import.cs (Evaluate): Moved hack from tools/xbuild/Makefile here. It
        will try to import a.ext when given a.EXT.


svn path=/trunk/mcs/; revision=71563
2007-01-23 21:38:27 +00:00
Marek Sieradzki d4e1ed0407 2007-01-02 Marek Sieradzki <[email protected]>
* BuildWhen.cs, BuildPropertyGroupCollection.cs,
        BuildItemGroupCollection.cs, Project.cs, GroupingCollection.cs:
        GroupingCollection doesn't need Project reference.

        * BuildTask.cs, Target.cs, TaskEngine.cs, BatchingImpl.cs: Formatting

        * BuildItemGroup.cs: Added new readOnly parameter to ctor.
        (Project.EvaluatedItems is a read only item group.)
        (ReplaceWith): Added.

        * BuildPropertyGroup.cs (IsGlobal): Added. Setting a property in
        global property group causes reevaluation of its project.

        * Project.cs: ProcessXml () is internal and can be "safely" invoked by
        other classes.

        * OldExpression.cs: Removed.

        * BuildProperty.cs (Evaluate): Simplified.

        * ChangeType.cs (TemporaryTransform): Simplified.

        * BuildItem.cs: There are now 3 types of build items: from XML, having
        parent from XML, virtual. Added SplitParentItem ().


svn path=/trunk/mcs/; revision=70342
2007-01-02 11:21:51 +00:00
Marek Sieradzki 52f8ef62f9 006-12-16 Marek Sieradzki <[email protected]>
* ItemPropertyGroupingBase.cs, TaskEngineAssemblyResolver.cs: Removed
        classes that were public in Beta 2 and aren't used.

        * Expression.cs: Added replacement for parsing expressions char by
        char. It uses regexes to find item/property/metadata references in
        given text.

        * ExpressionCollection.cs, BuildTask.cs, ConditionFactorExpression.cs,
        Target.cs, TaskEngine.cs, BuildItemGroup.cs, UsingTask.cs, Import.cs,
        BuildItem.cs, BatchingImpl.cs, BuildProperty.cs: Track API changes.

        * ConditionRelationalExpression.cs: Formatting.

        * OldExpression.cs: Commented everything.

        * MetadataReference.cs, ItemReference.cs, PropertyReference.cs: Moved
        parsing to Expression.

        * BuildItem.cs: Check if project is from XML in set_Condition and
        set_Exclude.

        * BuildPropertyGroup.cs, Project.cs: Add ImportedProject to 
        Project.ctor.

        * ConditionNotExpression.cs, ConditionAndExpression.cs: Check if we
        can evaluate expression in CanEvaluateToBool ().


svn path=/trunk/mcs/; revision=69557
2006-12-15 23:35:11 +00:00
Marek Sieradzki 9c9a240123 2006-12-11 Marek Sieradzki <[email protected]>
* TaskEngine.cs, ItemReference.cs: Use IDictionary <string,
        BuildItemGroup> not IDictionary.

        * BuildItemGroup.cs, BuildItem.cs: Evaluate even if condition was
        evaluated to false because we want to add every item to
        Project.EvaluatedItemsByNameIgnoringCondition.

        * Project.cs (Build): Don't throw an exception just return false.
        (GetEvaluatedProperty): Avoid NullReferenceException.
        (SetProjectExtensions): Implemented.


svn path=/trunk/mcs/; revision=69320
2006-12-11 13:45:48 +00:00
Marek Sieradzki 988e75c34a 2006-12-07 Marek Sieradzki <[email protected]>
* BuildTask.cs: Implemented AddOutputItem () and AddOutputProperty ().

        * UsingTaskCollection.cs: Removed [MonoTODO] and used CopyTo in CopyTo
        (UsingTask[] array, int index)

        * TaskEngine.cs: Reformatted PublishOutput () and added copying of
        items to Project.EvaluatedItems in PublishItemGroup ();

        * BuildItemGroup.cs: Added [MonoTODO].

        * UsingTask.cs: Used expression for AssemblyFile to get around
        problems with '\' and '/'.

        * BuildItem.cs (ctor): Added null checks.
        (GetMetadata): Return unevaluatedMetadata not evaluatedMetadata.
        (SetMetadata): Don't escape evaluatedMetadata and escape
        unevaluatedMetadata only when treatPropertyValueAsLiteral.

        * BuildPropertyGroup.cs (GetEnumerator, Evaluate, RemoveProperty): Use
        FromXml () instead of null checks.
        (SetProperty): Escape propertyValue when it is literal.

        * BuildProperty.cs: Changed exception message.

        * Project.cs: Added XmlNamespaceManager and XmlNamespace internal 
        properties.
        (GetProjectExtensions): Implemented.


svn path=/trunk/mcs/; revision=69165
2006-12-07 10:30:42 +00:00
Marek Sieradzki 0b4f7a4559 2006-10-08 Marek Sieradzki <[email protected]>
* Target.cs: Changed "" to String.Empty.
        * TaskEngine.cs: Don't try to convert a parameter to specific type if
        string was evaluated to String.Empty.
        * InternalLoggerException.cs: 
        * InvalidProjectFileException.cs: Added LinkDemand before
        GetObjectData ().
        * ConsoleLogger.cs: Changed "" to String.Empty.
        * TargetCollection.cs: Fixed GetEnumerator () (stupid bug introduced
	with change to generics).
        * Project.cs: Made Build () throw more meaningful exception.										


svn path=/trunk/mcs/; revision=66403
2006-10-08 11:10:43 +00:00
Marek Sieradzki b348067a7e 2006-10-06 Marek Sieradzki <[email protected]>
* Target.cs: Reformatted.
        * TaskEngine.cs: Removed redundant code.
        * BuildPropertyGroup.cs: Fixed Clear () and AddNewProperty ().
        * Engine.cs: Made BuildProjectFile () load project file if it's not
        loaded yet.


svn path=/trunk/mcs/; revision=66335
2006-10-06 09:13:14 +00:00
Marek Sieradzki c654ca4dc0 2006-08-15 Marek Sieradzki <[email protected]>
* BuildTask.cs, UsingTaskCollection.cs, ImportCollection.cs,
        Target.cs, TaskDatabase.cs, TaskEngine.cs, BuildItemGroup.cs,
        BuildChoose.cs, DirectoryScanner.cs, BuildPropertyGroup.cs,
        TargetCollection.cs, Engine.cs, Project.cs: Started to use generics.


svn path=/trunk/mcs/; revision=63750
2006-08-15 09:29:31 +00:00
Marek Sieradzki 6a406d6c72 2006-05-03 Marek Sieradzki <[email protected]>
* Target.cs, TaskEngine.cs, BuildItemGroup.cs, MetadataReference.cs,
        Import.cs, ItemReference.cs, BuildItem.cs, BatchingImpl.cs,
        PropertyReference.cs, BuildProperty.cs: Changed Expression to
        OldExpression and changed To* functions to one ConvertTo ().
        * TaskEngine.cs: Fixed PublishOutput ().
        * OldExpression.cs: Added. It will be temporarily used before
        LiteralExpression will be written using Tokenizer.
        * Tokenizer.cs, Token.cs, ExpressionCollection.cs,
        ExpressionParseException.cs, LiteralExpression.cs: Added.


svn path=/trunk/mcs/; revision=60212
2006-05-03 10:44:05 +00:00
Marek Sieradzki c83df40ab3 2006-03-21 Crestez Leonard <[email protected]>
* Target.cs, TaskEngine.cs, BuildItemGroup.cs, BuildItem.cs,
	BuildPropertyGroup.cs, TargetCollection.cs, BuildProperty.cs,
	Engine.cs, Project.cs, BuildTask.cs, UsingTask.cs: Separate xml
	binding and evaluation, merge xml binding in constructors.
	* DirectoryScanner.cs: Includes CAN be empty.
	* BuildChoose.cs, ItemReference.cs, ChangeType.cs: Newline at EOF.
	* ConsoleLogger.cs: Fix compilation warning.

svn path=/trunk/mcs/; revision=58226
2006-03-21 17:06:28 +00:00
Marek Sieradzki b1af4814bb 2006-03-18 Crestez Leonard <[email protected]>
* Project.cs: Cleaned up add.
	* Expression.cs: Hacked to transform \ and / to path separators.
	* BuildPropertyGroup.cs: Small cleanup.
	* BuildTask.cs, TaskEngine.cs: Fix TaskEngine not getting a Project
	reference.

svn path=/trunk/mcs/; revision=58135
2006-03-18 12:03:06 +00:00
Marek Sieradzki 74041f540e 2006-03-11 Marek Sieradzki <[email protected]>
* BatchingImpl.cs: Updated with BuildTask instead of TaskElement.
	* BuildItem.cs: Updated for new API and fixed crashing on non-existent
	files.
	* BuildItemGroup.cs, BuildItemGroupCollection.cs, BuildProperty.cs,
	BuildPropertyGroup.cs, BuildPropertyGroupCollection.cs, ConsoleLogger.cs,
	Engine.cs, Project.cs, Target.cs, TargetCollection.cs: Updated for new
	API.
	* DirectoryScanner.cs: Fixed ordering and crashing on duplicated items.
	* TaskElement.cs: Temporarily removed.
	* Xml.cs: Changed to static.

svn path=/trunk/mcs/; revision=57832
2006-03-11 17:41:42 +00:00