From mono-patches-list at lists.ximian.com  Tue Sep  1 00:00:39 2009
From: mono-patches-list at lists.ximian.com (Ankit Jain (radical@corewars.org))
Date: Tue,  1 Sep 2009 00:00:39 -0400 (EDT)
Subject: [Mono-patches] r140998 - in trunk/mcs/class:
	Microsoft.Build.Engine/Microsoft.Build.BuildEngine
	Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks
Message-ID: <20090901040039.396C09472C@mono-cvs.ximian.com>

Author: ankit
Date: 2009-09-01 00:00:38 -0400 (Tue, 01 Sep 2009)
New Revision: 140998

Modified:
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemReference.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MetadataReference.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetBatchingImpl.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UsingTask.cs
   trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
   trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
Log:
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.

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -106,7 +106,7 @@
 		protected void ParseAttribute (string value)
 		{
 			Expression expr = new Expression ();
-			expr.Parse (value, true);
+			expr.Parse (value, ParseOptions.AllowItemsMetadataAndSplit);
 
 			foreach (object o in expr.Collection) {
 				MetadataReference mr = o as MetadataReference;

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -227,7 +227,7 @@
 		{
 			if (parent_item_group != null) {
 				Expression e = new Expression ();
-				e.Parse (value, true);
+				e.Parse (value, ParseOptions.AllowItemsNoMetadataAndSplit);
 				evaluatedMetadata [name] = (string) e.ConvertTo (parent_item_group.ParentProject,
 						typeof (string), ExpressionOptions.ExpandItemRefs);
 			} else
@@ -264,9 +264,9 @@
 			string includes, excludes;
 
 			includeExpr = new Expression ();
-			includeExpr.Parse (Include, true);
+			includeExpr.Parse (Include, ParseOptions.AllowItemsNoMetadataAndSplit);
 			excludeExpr = new Expression ();
-			excludeExpr.Parse (Exclude, true);
+			excludeExpr.Parse (Exclude, ParseOptions.AllowItemsNoMetadataAndSplit);
 			
 			includes = (string) includeExpr.ConvertTo (project, typeof (string), ExpressionOptions.ExpandItemRefs);
 			excludes = (string) excludeExpr.ConvertTo (project, typeof (string), ExpressionOptions.ExpandItemRefs);
@@ -360,7 +360,7 @@
 					// but letting this be here, incase BI.ConvertTo*
 					// is called directly
 					Expression expr = new Expression ();
-					expr.Parse (finalItemSpec, true);
+					expr.Parse (finalItemSpec, ParseOptions.AllowItemsNoMetadataAndSplit);
 
 					return (string) expr.ConvertTo (parent_item_group.ParentProject,
 							typeof (string), ExpressionOptions.ExpandItemRefs);

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -122,7 +122,7 @@
 
 			// In evaluate phase, properties are not expanded
 			Expression exp = new Expression ();
-			exp.Parse (Value, false, false);
+			exp.Parse (Value, ParseOptions.None);
 			evaluated.finalValue = (string) exp.ConvertTo (parentProject, typeof (string),
 					ExpressionOptions.DoNotExpandItemRefs);
 
@@ -150,7 +150,8 @@
 				Expression exp = new Expression ();
 
 				// in non-evaluation phase, properties are always expanded
-				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs, false);
+				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs ?
+							ParseOptions.AllowItems : ParseOptions.None);
 				return (string) exp.ConvertTo (project, typeof (string), options);
 			} finally {
 				converting = false;
@@ -172,7 +173,8 @@
 				Expression exp = new Expression ();
 
 				// in non-evaluation phase, properties are always expanded
-				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs, false);
+				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs ?
+							ParseOptions.AllowItems : ParseOptions.None);
 				return (ITaskItem[]) exp.ConvertTo (project, typeof (ITaskItem[]), options);
 			} finally {
 				converting = false;

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -230,7 +230,7 @@
 					return false;
 				else {
 					Expression exp = new Expression ();
-					exp.Parse (str, true);
+					exp.Parse (str, ParseOptions.AllowItemsNoMetadataAndSplit);
 					return (bool) exp.ConvertTo (parentTarget.Project, typeof (bool),
 							ExpressionOptions.ExpandItemRefs);
 				}

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 04:00:38 UTC (rev 140998)
@@ -1,3 +1,22 @@
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	* 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.
+
 2009-08-29  Ankit Jain  <jankit at novell.com>
 
 	* Expression.cs (ExpressionOptions): New.

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -122,7 +122,7 @@
 		static Token EvaluateToken (Token token, Project context)
 		{
 			Expression oe = new Expression ();
-			oe.Parse (token.Value, true);
+			oe.Parse (token.Value, ParseOptions.AllowItemsMetadataAndSplit);
 			return new Token ((string) oe.ConvertTo (context, typeof (string)), token.Type);
 		}
 	}

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -65,18 +65,19 @@
 			this.expressionCollection = new ExpressionCollection ();
 		}
 
-		public void Parse (string expression, bool allowItems)
-		{
-			Parse (expression, allowItems, true);
-		}
-
-		// @split: Split on ';'
+		// Split: Split on ';'
 		//	   Eg. Property values don't need to be split
 		//
-		// @allowItems: item refs should not be treated as item refs!
+		// AllowItems: if false, item refs should not be treated as item refs!
 		//	        it converts them to strings in the final expressionCollection
-		public void Parse (string expression, bool allowItems, bool split)
+		//
+		// AllowMetadata: same as AllowItems, for metadata
+		public void Parse (string expression, ParseOptions options)
 		{
+			bool split = (options & ParseOptions.Split) == ParseOptions.Split;
+			bool allowItems = (options & ParseOptions.AllowItems) == ParseOptions.AllowItems;
+			bool allowMd = (options & ParseOptions.AllowMetadata) == ParseOptions.AllowMetadata;
+
 			expression = expression.Replace ('/', Path.DirectorySeparatorChar);
 			expression = expression.Replace ('\\', Path.DirectorySeparatorChar);
 		
@@ -117,7 +118,7 @@
 				}
 			}
 
-			CopyToExpressionCollection (p3, allowItems);
+			CopyToExpressionCollection (p3, allowItems, allowMd);
 		}
 
 		void Prepare (List <ArrayList> l, int length)
@@ -126,7 +127,7 @@
 				l.Add (null);
 		}
 		
-		void CopyToExpressionCollection (List <ArrayList> lists, bool allowItems)
+		void CopyToExpressionCollection (List <ArrayList> lists, bool allowItems, bool allowMd)
 		{
 			for (int i = 0; i < lists.Count; i++) {
 				foreach (object o in lists [i]) {
@@ -134,6 +135,9 @@
 						expressionCollection.Add (Utilities.Unescape ((string) o));
 					else if (!allowItems && o is ItemReference)
 						expressionCollection.Add (((ItemReference) o).OriginalString);
+					else if (!allowMd && o is MetadataReference) {
+						expressionCollection.Add (((MetadataReference) o).OriginalString);
+					}
 					else if (o is IReference)
 						expressionCollection.Add ((IReference) o);
 				}
@@ -246,7 +250,8 @@
 				
 				meta = m.Groups [MetadataRegex.GroupNumberFromName ("meta")].Value;
 				
-				mr = new MetadataReference (name, meta, m.Groups [0].Index, m.Groups [0].Length);
+				mr = new MetadataReference (text.Substring (m.Groups [0].Index, m.Groups [0].Length),
+								name, meta, m.Groups [0].Index, m.Groups [0].Length);
 				phase1.Add (mr);
 				m = m.NextMatch ();
 			}
@@ -326,6 +331,21 @@
 		}
 	}
 
+	[Flags]
+	enum ParseOptions {
+		// absence of one of these flags, means
+		// false for that option
+		AllowItems = 0x1,
+		Split = 0x2,
+		AllowMetadata = 0x4,
+
+		None = 0x8, // == no items, no metadata, and no split
+
+		// commonly used options
+		AllowItemsMetadataAndSplit = AllowItems | Split | AllowMetadata,
+		AllowItemsNoMetadataAndSplit = AllowItems | Split
+	}
+
 	enum ExpressionOptions {
 		ExpandItemRefs,
 		DoNotExpandItemRefs

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -81,7 +81,7 @@
 			Expression exp;
 
 			exp = new Expression ();
-			exp.Parse (file, false);
+			exp.Parse (file, ParseOptions.Split);
 			return (string) exp.ConvertTo (project, typeof (string));
 		}
 

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemReference.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemReference.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemReference.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -53,12 +53,12 @@
 			// Transform and separator are never expanded for item refs
 			if (transform != null) {
 				this.transform = new Expression ();
-				this.transform.Parse (transform, false);
+				this.transform.Parse (transform, ParseOptions.AllowMetadata | ParseOptions.Split);
 			}
 
 			if (separator != null) {
 				this.separator = new Expression ();
-				this.separator.Parse (separator, false);
+				this.separator.Parse (separator, ParseOptions.Split);
 			}
 		}
 		

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MetadataReference.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MetadataReference.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MetadataReference.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -40,9 +40,11 @@
 		string		metadataName;
 		int start;
 		int length;
+		string original;
 	
-		public MetadataReference (string itemName, string metadataName, int start, int length)
+		public MetadataReference (string original, string itemName, string metadataName, int start, int length)
 		{
+			this.original = original;
 			this.itemName = itemName;
 			this.metadataName = metadataName;
 			this.start = start;
@@ -128,6 +130,10 @@
 			else
 				return String.Format ("%({0})", metadataName);
 		}
+
+		public string OriginalString {
+			get { return original; }
+		}
 	}
 }
 

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -157,7 +157,7 @@
 
 			if (DependsOnTargets != String.Empty) {
 				deps = new Expression ();
-				deps.Parse (DependsOnTargets, true);
+				deps.Parse (DependsOnTargets, ParseOptions.AllowItemsNoMetadataAndSplit);
 				targetNames = (string []) deps.ConvertTo (Project, typeof (string []));
 				foreach (string dep_name in targetNames) {
 					t = project.Targets [dep_name.Trim ()];
@@ -291,7 +291,7 @@
 					return new ITaskItem [0];
 
 				Expression e = new Expression ();
-				e.Parse (outputs, true);
+				e.Parse (outputs, ParseOptions.AllowItemsNoMetadataAndSplit);
 
 				return (ITaskItem []) e.ConvertTo (project, typeof (ITaskItem []));
 			}

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetBatchingImpl.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetBatchingImpl.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetBatchingImpl.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -176,11 +176,11 @@
 				return true;
 
 			Expression e = new Expression ();
-			e.Parse (inputs, true);
+			e.Parse (inputs, ParseOptions.AllowItemsNoMetadataAndSplit);
 			inputFiles = (ITaskItem[]) e.ConvertTo (project, typeof (ITaskItem[]), ExpressionOptions.ExpandItemRefs);
 
 			e = new Expression ();
-			e.Parse (outputs, true);
+			e.Parse (outputs, ParseOptions.AllowItemsNoMetadataAndSplit);
 			outputFiles = (ITaskItem[]) e.ConvertTo (project, typeof (ITaskItem[]), ExpressionOptions.ExpandItemRefs);
 
 			if (inputFiles == null || inputFiles.Length == 0)

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -225,7 +225,7 @@
 			result = null;
 			
 			e = new Expression ();
-			e.Parse (raw, true);
+			e.Parse (raw, ParseOptions.AllowItemsMetadataAndSplit);
 
 			// See rules in comment for 'Prepare'
 			string str = (string) e.ConvertTo (parentProject, typeof (string));

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UsingTask.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UsingTask.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UsingTask.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -73,7 +73,7 @@
 			} else if (AssemblyFile != null) {
 				Expression exp = new Expression ();
 				// FIXME: test it
-				exp.Parse (AssemblyFile, false);
+				exp.Parse (AssemblyFile, ParseOptions.Split);
 				string filename = (string) exp.ConvertTo (project, typeof (string));
 
 				if (Path.IsPathRooted (filename) == false) {

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog	2009-09-01 04:00:38 UTC (rev 140998)
@@ -1,3 +1,8 @@
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	* TaskBatchingTest.cs: Add new tests for metadata refs found
+	in places other than task attributes.
+
 2009-08-28  Ankit Jain  <jankit at novell.com>
 
 	* CopyTest.cs (TestCopy_EmptySources): New.

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs	2009-09-01 03:14:07 UTC (rev 140997)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs	2009-09-01 04:00:38 UTC (rev 140998)
@@ -507,6 +507,110 @@
 			CheckEngineEventCounts (testLogger, 1, 1, 2, 2);
 		}
 
+		[Test]
+		// test for metadata refs in properties or items
+		public void TestNoBatching () {
+			string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+	<ItemGroup>
+		<item3 Include=""foo""/>
+		<item2 Include=""%(item3.Identity)""/>
+		<item0 Include=""@(item3)""/>
+	</ItemGroup>
+	<PropertyGroup>
+		<Prop1>%(item0.Identity)</Prop1>
+	</PropertyGroup>
+	<Target Name='1'>
+		<Message Text=""Prop1: $(Prop1)""/>
+		<Message Text=""Item2: @(item2)""/>
+	</Target>
+</Project>";
+
+			Engine engine = new Engine (Consts.BinPath);
+			Project project = engine.CreateNewProject ();
+
+			TestMessageLogger testLogger = new TestMessageLogger ();
+			engine.RegisterLogger (testLogger);
+
+			project.LoadXml (projectString);
+			if (!project.Build ("1")) {
+				testLogger.DumpMessages ();
+				Assert.Fail ("Build failed");
+			}
+
+			testLogger.CheckLoggedMessageHead ("Prop1: %(item0.Identity)", "A1");
+			testLogger.CheckLoggedMessageHead ("Item2: %(item3.Identity)", "A2");
+			Assert.AreEqual (0, testLogger.NormalMessageCount, "Unexpected extra messages found");
+		}
+
+		[Test]
+		// test for metadata refs via metadata refs
+		// batching should happen only on basis of the task attributes,
+		// and not the resolved expression values
+		public void TestBatching1 () {
+			string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"" ToolsVersion=""3.5"">
+	<ItemGroup>
+		<item3 Include=""foo""/>
+		<item2 Include=""%(item3.Identity)""/>
+
+		<item4 Include=""%(item2.Identity);@(item3);@(nonexistant)""/>
+		<item4 Include=""bar""/>
+	</ItemGroup>
+	<Target Name='1'>
+		<Message Text=""Item4: %(item4.Identity)""/>
+	</Target>
+</Project>";
+
+			Engine engine = new Engine (Consts.BinPath);
+			Project project = engine.CreateNewProject ();
+
+			TestMessageLogger testLogger = new TestMessageLogger ();
+			engine.RegisterLogger (testLogger);
+
+			project.LoadXml (projectString);
+			if (!project.Build ("1")) {
+				testLogger.DumpMessages ();
+				Assert.Fail ("Build failed");
+			}
+
+			testLogger.CheckLoggedMessageHead ("Item4: %(item2.Identity)", "A1");
+			testLogger.CheckLoggedMessageHead ("Item4: foo", "A2");
+			testLogger.CheckLoggedMessageHead ("Item4: bar", "A3");
+			Assert.AreEqual (0, testLogger.NormalMessageCount, "Unexpected extra messages found");
+		}
+
+		[Test]
+		// test for metadata refs via metadata refs
+		// batching should happen only on basis of the task attributes,
+		// and not the resolved expression values
+		public void TestConditionalBatching2 () {
+			string projectString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"" ToolsVersion=""3.5"">
+	<ItemGroup>
+		<item2 Include=""%(item3.Identity)""/>
+		<item4 Include=""%(item2.Identity);@(item3)""/>
+	</ItemGroup>
+	<Target Name='1'>
+		<Message Text=""Item3: %(item2.Identity)"" Condition="" '%(item5.Identity)' == '' ""/>
+		<Message Text=""Item4: %(item4.Identity)""/>
+	</Target>
+</Project>";
+
+			Engine engine = new Engine (Consts.BinPath);
+			Project project = engine.CreateNewProject ();
+
+			TestMessageLogger testLogger = new TestMessageLogger ();
+			engine.RegisterLogger (testLogger);
+
+			project.LoadXml (projectString);
+			if (!project.Build ("1")) {
+				testLogger.DumpMessages ();
+				Assert.Fail ("Build failed");
+			}
+
+			testLogger.CheckLoggedMessageHead ("Item3: %(item3.Identity)", "A1");
+			testLogger.CheckLoggedMessageHead ("Item4: %(item2.Identity)", "A2");
+			Assert.AreEqual (0, testLogger.NormalMessageCount, "Unexpected extra messages found");
+		}
+
 		//Target batching
 
 		[Test]


From mono-patches-list at lists.ximian.com  Tue Sep  1 00:04:11 2009
From: mono-patches-list at lists.ximian.com (Ankit Jain (radical@corewars.org))
Date: Tue,  1 Sep 2009 00:04:11 -0400 (EDT)
Subject: [Mono-patches] r140999 -
	trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine
Message-ID: <20090901040411.BCE529472C@mono-cvs.ximian.com>

Author: ankit
Date: 2009-09-01 00:04:11 -0400 (Tue, 01 Sep 2009)
New Revision: 140999

Modified:
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
Log:
* DirectoryScanner.cs (Scan): Ignore empty entries in includes and
excludes.

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 04:00:38 UTC (rev 140998)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 04:04:11 UTC (rev 140999)
@@ -1,5 +1,10 @@
 2009-09-01  Ankit Jain  <jankit at novell.com>
 
+	* DirectoryScanner.cs (Scan): Ignore empty entries in includes and
+	excludes.
+
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
 	* Expression.cs (ParseOptions): New enum. Replace the bool params
 	of exression.Parse with this. Add option to control expansion of
 	metadata references.

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs	2009-09-01 04:00:38 UTC (rev 140998)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs	2009-09-01 04:04:11 UTC (rev 140999)
@@ -59,8 +59,8 @@
 			excludedItems = new Dictionary <string, bool> ();
 			includedItems = new List <string> ();
 			
-			splitInclude = includes.Split (';');
-			splitExclude = excludes.Split (';');
+			splitInclude = includes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+			splitExclude = excludes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
 			
 			if (excludes != String.Empty) {
 				foreach (string si in splitExclude) {


From mono-patches-list at lists.ximian.com  Tue Sep  1 00:04:29 2009
From: mono-patches-list at lists.ximian.com (Ankit Jain (radical@corewars.org))
Date: Tue,  1 Sep 2009 00:04:29 -0400 (EDT)
Subject: [Mono-patches] r141000 -
	trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks
Message-ID: <20090901040429.6C9629472C@mono-cvs.ximian.com>

Author: ankit
Date: 2009-09-01 00:04:29 -0400 (Tue, 01 Sep 2009)
New Revision: 141000

Modified:
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
Log:
* ResolveAssemblyReference.cs (ResolveReference): targetFrameworkDirectories
can be null.

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog	2009-09-01 04:04:11 UTC (rev 140999)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog	2009-09-01 04:04:29 UTC (rev 141000)
@@ -1,3 +1,8 @@
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	* ResolveAssemblyReference.cs (ResolveReference): targetFrameworkDirectories
+	can be null.
+
 2009-08-28  Ankit Jain  <jankit at novell.com>
 
 	* AssignCulture.cs, AssignTargetPath.cs,

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs	2009-09-01 04:04:11 UTC (rev 140999)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs	2009-09-01 04:04:29 UTC (rev 141000)
@@ -193,6 +193,8 @@
 				if (String.Compare (spath, "{HintPathFromItem}") == 0) {
 					resolved = assembly_resolver.ResolveHintPathReference (item, specific_version);
 				} else if (String.Compare (spath, "{TargetFrameworkDirectory}") == 0) {
+					if (targetFrameworkDirectories == null)
+						continue;
 					foreach (string fpath in targetFrameworkDirectories) {
 						resolved = assembly_resolver.FindInTargetFramework (item,
 								fpath, specific_version);


From mono-patches-list at lists.ximian.com  Tue Sep  1 00:28:36 2009
From: mono-patches-list at lists.ximian.com (Geoff Norton (gnorton@novell.com))
Date: Tue,  1 Sep 2009 00:28:36 -0400 (EDT)
Subject: [Mono-patches] r141001 - trunk/mono/mono/mini
Message-ID: <20090901042836.929589472C@mono-cvs.ximian.com>

Author: gnorton
Date: 2009-09-01 00:28:29 -0400 (Tue, 01 Sep 2009)
New Revision: 141001

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini.c
Log:
2009-09-01  Geoff Norton  <gnorton at novell.com>

        * mini.c (mono_get_lmf_addr): Fix jit_thread_attach for native to
        managed wrappers in full aot.

Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog	2009-09-01 04:04:29 UTC (rev 141000)
+++ trunk/mono/mono/mini/ChangeLog	2009-09-01 04:28:29 UTC (rev 141001)
@@ -1,3 +1,8 @@
+2009-09-01  Geoff Norton  <gnorton at novell.com>
+
+	* mini.c (mono_get_lmf_addr): Fix jit_thread_attach for native to 
+	managed wrappers in full aot.
+
 2009-08-31  Zoltan Varga  <vargaz at gmail.com>
 
 	* exceptions-x86.c (get_throw_exception): Align the stack on osx.

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c	2009-09-01 04:04:29 UTC (rev 141000)
+++ trunk/mono/mono/mini/mini.c	2009-09-01 04:28:29 UTC (rev 141001)
@@ -2163,6 +2163,19 @@
 	if ((jit_tls = TlsGetValue (mono_jit_tls_id)))
 		return &jit_tls->lmf;
 
+	/*
+	 * When resolving the call to mono_jit_thread_attach full-aot will look
+	 * in the plt, which causes a call into the generic trampoline, which in turn
+	 * tries to resolve the lmf_addr creating a cyclic dependency.  We cannot
+	 * call mono_jit_thread_attach from the native-to-managed wrapper, without
+	 * mono_get_lmf_addr, and mono_get_lmf_addr requires the thread to be attached.
+	 */
+
+	mono_jit_thread_attach (NULL);
+	
+	if ((jit_tls = TlsGetValue (mono_jit_tls_id)))
+		return &jit_tls->lmf;
+
 	g_assert_not_reached ();
 	return NULL;
 #endif


From mono-patches-list at lists.ximian.com  Tue Sep  1 02:11:38 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 02:11:38 -0400 (EDT)
Subject: [Mono-patches] r141002 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.Gettext: .
	MonoDevelop.Gettext.Editor
Message-ID: <20090901061138.690369472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 02:11:38 -0400 (Tue, 01 Sep 2009)
New Revision: 141002

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
Log:
* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Show file icon in
  found in list.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/ChangeLog	2009-09-01 04:28:29 UTC (rev 141001)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/ChangeLog	2009-09-01 06:11:38 UTC (rev 141002)
@@ -1,3 +1,8 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Show file icon
+	  in found in list.
+
 2009-08-31  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MonoDevelop.Gettext.addin.xml: Don't use the text editor

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs	2009-09-01 04:28:29 UTC (rev 141001)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs	2009-09-01 06:11:38 UTC (rev 141002)
@@ -144,17 +144,26 @@
 			treeviewEntries.GetColumn (3).Resizable = true;
 			treeviewEntries.GetColumn (3).Expand = true;
 			// found in tree view
-			foundInStore = new ListStore (typeof (string), typeof (string), typeof (string));
+			foundInStore = new ListStore (typeof (string), typeof (string), typeof (string), typeof (Pixbuf));
 			this.treeviewFoundIn.Model = foundInStore;
 			
-			treeviewFoundIn.AppendColumn ("", new CellRendererText (), "text", FoundInColumns.File);
+			TreeViewColumn fileColumn = new TreeViewColumn ();
+			CellRendererPixbuf pixbufRenderer = new CellRendererPixbuf ();
+			fileColumn.PackStart (pixbufRenderer, false);
+			fileColumn.SetAttributes (pixbufRenderer, "pixbuf", FoundInColumns.Pixbuf);
+			
+			CellRendererText textRenderer = new CellRendererText ();
+			fileColumn.PackStart (textRenderer, true);
+			fileColumn.SetAttributes (textRenderer, "text", FoundInColumns.File);
+			treeviewFoundIn.AppendColumn (fileColumn);
+			
 			treeviewFoundIn.AppendColumn ("", new CellRendererText (), "text", FoundInColumns.Line);
 			treeviewFoundIn.HeadersVisible = false;
 			treeviewFoundIn.GetColumn (1).FixedWidth = 100;
 			
 			treeviewFoundIn.RowActivated += delegate (object sender, RowActivatedArgs e) {
 				Gtk.TreeIter iter;
-				foundInStore.GetIter (out iter, e.Path); 				
+				foundInStore.GetIter (out iter, e.Path);
 				string line = foundInStore.GetValue (iter, (int)FoundInColumns.Line) as string;
 				string file = foundInStore.GetValue (iter, (int)FoundInColumns.FullFileName) as string;
 				int lineNr = 1;
@@ -632,7 +641,7 @@
 							line = "?";
 						}
 						string fullName = System.IO.Path.Combine (System.IO.Path.GetDirectoryName (this.poFileName), file);
-						this.foundInStore.AppendValues (file, line, fullName);
+						this.foundInStore.AppendValues (file, line, fullName, DesktopService.GetPixbufForFile (fullName, IconSize.Menu));
 					}
 				}
 				
@@ -665,7 +674,8 @@
 		{
 			File,
 			Line,
-			FullFileName
+			FullFileName,
+			Pixbuf
 		}
 		
 		protected override void OnStyleSet (Gtk.Style previous_style)


From mono-patches-list at lists.ximian.com  Tue Sep  1 02:24:35 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 02:24:35 -0400 (EDT)
Subject: [Mono-patches] r141003 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring: .
	MonoDevelop.Refactoring
Message-ID: <20090901062435.C35529472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 02:24:35 -0400 (Tue, 01 Sep 2009)
New Revision: 141003

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Log:
* MonoDevelop.Refactoring/RefactoryCommands.cs: ResolvedType is no
  longer used for the resolve namespace feature. Therefore replaced
  the check with an expression check.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 06:11:38 UTC (rev 141002)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 06:24:35 UTC (rev 141003)
@@ -1,3 +1,9 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* MonoDevelop.Refactoring/RefactoryCommands.cs: ResolvedType
+	  is no longer used for the resolve namespace feature.
+	  Therefore replaced the check with an expression check.
+
 2009-08-31  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.Refactoring/RefactoringOptions.cs:

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 06:11:38 UTC (rev 141002)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 06:24:35 UTC (rev 141003)
@@ -169,7 +169,7 @@
 					eitem = null;
 				}
 			}
-			if (resolveResult != null && resolveResult.ResolvedType != null) {
+			if (resolveResult != null  && resolveResult.ResolvedExpression != null && !string.IsNullOrEmpty (resolveResult.ResolvedExpression.Expression)) {
 				IReturnType returnType = new DomReturnType (resolveResult.ResolvedExpression.Expression);
 				List<string> namespaces = new List<string> (ctx.ResolvePossibleNamespaces (returnType));
 				if (item == null || namespaces.Count > 1) {


From mono-patches-list at lists.ximian.com  Tue Sep  1 02:41:15 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 02:41:15 -0400 (EDT)
Subject: [Mono-patches] r141004 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Dom
Message-ID: <20090901064115.2D4099472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 02:41:14 -0400 (Tue, 01 Sep 2009)
New Revision: 141004

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomUsing.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
Log:
* MonoDevelop.Projects.Dom/DomUsing.cs:
* MonoDevelop.Projects.Dom/CompilationUnit.cs:
* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added some helper
  functions.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 06:24:35 UTC (rev 141003)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 06:41:14 UTC (rev 141004)
@@ -1,3 +1,10 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* MonoDevelop.Projects.Dom/DomUsing.cs:
+	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
+	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added some
+	  helper functions.
+
 2009-08-31  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MonoDevelop.Projects.Formats.MSBuild\SlnFileFormat.cs: Fix

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 06:24:35 UTC (rev 141003)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 06:41:14 UTC (rev 141004)
@@ -27,6 +27,7 @@
 //
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using MonoDevelop.Core;
@@ -98,11 +99,21 @@
 			}
 			return null;
 		}
+		
+		public IType GetTypeAt (DomLocation location)
+		{
+			return GetTypeAt (location.Line, location.Column);
+		}
+		
 		public IType GetTypeAt (int line, int column)
 		{
 			return GetTypeAt (types, line, column);
 		}
 		
+		public IMember GetMemberAt (DomLocation location)
+		{
+			return GetMemberAt (location.Line, location.Column);
+		}
 		public IMember GetMemberAt (int line, int column)
 		{
 			IType type = GetTypeAt (line, column);
@@ -129,6 +140,16 @@
 			types.Add (newType);
 		}
 		
+		public bool IsNamespaceUsedAt (string name, int line, int column)
+		{
+			return IsNamespaceUsedAt (name, new DomLocation (line, column));
+		}
+		
+		public bool IsNamespaceUsedAt (string name, DomLocation location)
+		{
+			return usings.Where (u => ((!u.IsFromNamespace && u.Region.Start < location) || u.Region.Contains (location)) && u.Namespaces.Contains (name)).Any ();
+		}
+		
 		public void GetNamespaceContents (List<IMember> list, string subNamespace, bool caseSensitive)
 		{
 			foreach (IType type in Types) {

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomUsing.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomUsing.cs	2009-09-01 06:24:35 UTC (rev 141003)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomUsing.cs	2009-09-01 06:41:14 UTC (rev 141004)
@@ -92,5 +92,11 @@
 		{
 			return visitor.Visit (this, data);
 		}
+		
+		public override string ToString ()
+		{
+			return string.Format ("[DomUsing: Region={0}, Namespaces=({1}), IsFromNamespace={2}]", Region, string.Join (",", namespaces.ToArray ()), IsFromNamespace);
+		}
+		
 	}
 }

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 06:24:35 UTC (rev 141003)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 06:41:14 UTC (rev 141004)
@@ -53,7 +53,14 @@
 		
 		IType GetType (string fullName, int genericParameterCount);
 		IType GetTypeAt (int line, int column);
+		IType GetTypeAt (DomLocation location);
+		
 		IMember GetMemberAt (int line, int column);
+		IMember GetMemberAt (DomLocation location);
+		
 		void GetNamespaceContents (List<IMember> list, string subNameSpace, bool caseSensitive);
+		
+		bool IsNamespaceUsedAt (string name, int line, int column);
+		bool IsNamespaceUsedAt (string name, DomLocation location);
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:07:30 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 03:07:30 -0400 (EDT)
Subject: [Mono-patches] r141005 - in
	trunk/mcs/class/System.ServiceModel.Web: .
	System.ServiceModel.Web Test/System.ServiceModel.Web
Message-ID: <20090901070730.9B5FF9472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 03:07:30 -0400 (Tue, 01 Sep 2009)
New Revision: 141005

Added:
   trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
Modified:
   trunk/mcs/class/System.ServiceModel.Web/ChangeLog
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/ChangeLog
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebRequestContext.cs
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebResponseContext.cs
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web_test.dll.sources
   trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog
   trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* WebOperationContext.cs : Current is automatically created (even
	  without WebHttpBehavior or WebChannelFactory).
	* IncomingWebRequestContext.cs, IncomingWebResponseContext.cs:
	  WebOperationContext could be created regardless of whether it is
	  request or not. So do not premise incoming members existence.

	* WebOperationContextTest.cs : new test.
	* WebInvokeAttributeTest.cs : new test, not working.

	* System.ServiceModel.Web_test.dll.sources :
	  added WebOperationContextTest.cs.



Modified: trunk/mcs/class/System.ServiceModel.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/ChangeLog	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/ChangeLog	2009-09-01 07:07:30 UTC (rev 141005)
@@ -1,3 +1,8 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* System.ServiceModel.Web_test.dll.sources :
+	  added WebOperationContextTest.cs.
+
 2009-07-20  Jb Evain  <jbevain at novell.com>
 
 	* Makefile: filter the valid profile on the framework version,

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/ChangeLog	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/ChangeLog	2009-09-01 07:07:30 UTC (rev 141005)
@@ -1,3 +1,11 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* WebOperationContext.cs : Current is automatically created (even
+	  without WebHttpBehavior or WebChannelFactory).
+	* IncomingWebRequestContext.cs, IncomingWebResponseContext.cs:
+	  WebOperationContext could be created regardless of whether it is
+	  request or not. So do not premise incoming members existence.
+
 2009-08-11  Atsushi Enomoto  <atsushi at ximian.com>
 
 	* WebChannelFactory.cs : added missing constructors.

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebRequestContext.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebRequestContext.cs	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebRequestContext.cs	2009-09-01 07:07:30 UTC (rev 141005)
@@ -39,7 +39,10 @@
 
 		internal IncomingWebRequestContext (OperationContext context)
 		{
-			hp = (HttpRequestMessageProperty) context.IncomingMessageProperties [HttpRequestMessageProperty.Name];
+			if (context.IncomingMessageProperties != null)
+				hp = (HttpRequestMessageProperty) context.IncomingMessageProperties [HttpRequestMessageProperty.Name];
+			else
+				hp = new HttpRequestMessageProperty ();
 		}
 
 		public string Accept {

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebResponseContext.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebResponseContext.cs	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/IncomingWebResponseContext.cs	2009-09-01 07:07:30 UTC (rev 141005)
@@ -38,7 +38,10 @@
 
 		internal IncomingWebResponseContext (OperationContext context)
 		{
-			hp = (HttpResponseMessageProperty) context.IncomingMessageProperties [HttpResponseMessageProperty.Name];
+			if (context.IncomingMessageProperties != null)
+				hp = (HttpResponseMessageProperty) context.IncomingMessageProperties [HttpResponseMessageProperty.Name];
+			else
+				hp = new HttpResponseMessageProperty ();
 		}
 
 		public long ContentLength {

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs	2009-09-01 07:07:30 UTC (rev 141005)
@@ -35,7 +35,16 @@
 	public class WebOperationContext : IExtension<OperationContext>
 	{
 		public static WebOperationContext Current {
-			get { return OperationContext.Current != null ? OperationContext.Current.Extensions.Find<WebOperationContext> () : null; }
+			get {
+				if (OperationContext.Current == null)
+					return null;
+				var ret = OperationContext.Current.Extensions.Find<WebOperationContext> ();
+				if (ret == null) {
+					ret = new WebOperationContext (OperationContext.Current);
+					OperationContext.Current.Extensions.Add (ret);
+				}
+				return ret;
+			}
 		}
 
 		IncomingWebRequestContext incoming_request;

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web_test.dll.sources
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web_test.dll.sources	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web_test.dll.sources	2009-09-01 07:07:30 UTC (rev 141005)
@@ -23,6 +23,7 @@
 System.ServiceModel.Syndication/XmlSyndicationContentTest.cs
 System.ServiceModel.Web/WebGetAttributeTest.cs
 System.ServiceModel.Web/WebInvokeAttributeTest.cs
+System.ServiceModel.Web/WebOperationContextTest.cs
 System.ServiceModel.Web/WebServiceHostTest.cs
 System.ServiceModel/WebHttpBindingTest.cs
 System/UriTemplateTest.cs

Modified: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog	2009-09-01 07:07:30 UTC (rev 141005)
@@ -1,3 +1,8 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* WebOperationContextTest.cs : new test.
+	* WebInvokeAttributeTest.cs : new test, not working.
+
 2008-04-21  Igor Zelmanovich <igorz at mainsoft.com>
 
 	* WebServiceHostTest.cs: new testfixture.

Modified: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs	2009-09-01 06:41:14 UTC (rev 141004)
+++ trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs	2009-09-01 07:07:30 UTC (rev 141005)
@@ -56,11 +56,27 @@
 			oper.Validate (od);
 		}
 
+		[Test]
+		[Ignore ("seems not valid test yet")]
+		[ExpectedException (typeof (InvalidOperationException))]
+		public void RejectTwoParametersWhenNotWrapped ()
+		{
+			WebChannelFactory<IBogusService1>.CreateChannel (new WebHttpBinding (), new EndpointAddress ("http://localhost:37564"));
+		}
+
 		[ServiceContract]
 		public interface TestService
 		{
 			[OperationContract]
 			string TestMethod (string input);
 		}
+
+		[ServiceContract]
+		public interface IBogusService1
+		{
+			[OperationContract]
+			[WebInvoke]
+			string Join (string s1, string s2);
+		}
 	}
 }

Added: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs	                        (rev 0)
+++ trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs	2009-09-01 07:07:30 UTC (rev 141005)
@@ -0,0 +1,67 @@
+//
+// WebOperationContextTest.cs
+//
+// Author:
+//	Atsushi Enomoto  <atsushi at ximian.com>
+//
+// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
+using System.ServiceModel.Web;
+using NUnit.Framework;
+
+using CategoryAttribute = NUnit.Framework.CategoryAttribute;
+
+namespace MonoTests.System.ServiceModel.Web
+{
+	[TestFixture]
+	public class WebOperationContextTest
+	{
+		[Test]
+		public void Current ()
+		{
+			Assert.IsNull (WebOperationContext.Current, "#1");
+			var binding = new WebHttpBinding ();
+			var address = new EndpointAddress ("http://localhost:37564");
+			var ch = (IContextChannel) WebChannelFactory<IHogeService>.CreateChannel (binding, address);
+			using (var ocs = new OperationContextScope (ch)) {
+				Assert.IsNotNull (WebOperationContext.Current, "#2");
+				Assert.IsNotNull (WebOperationContext.Current.OutgoingRequest, "#3");
+				Assert.IsNotNull (WebOperationContext.Current.IncomingRequest, "#4");
+				Assert.IsNotNull (WebOperationContext.Current.IncomingResponse, "#5");
+				Assert.IsNotNull (WebOperationContext.Current.OutgoingResponse, "#6"); // pointless though.
+			}
+			ch.Close ();
+		}
+	}
+
+	[ServiceContract]
+	public interface IHogeService
+	{
+		[WebGet]
+		[OperationContract]
+		string Join (string s1, string s2);
+	}
+}


Property changes on: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
___________________________________________________________________
Added: svn:eol-style
   + native


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:40:15 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 03:40:15 -0400 (EDT)
Subject: [Mono-patches] r141006 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Dom
Message-ID: <20090901074015.408569472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 03:40:15 -0400 (Tue, 01 Sep 2009)
New Revision: 141006

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
Log:
* MonoDevelop.Projects.Dom/CompilationUnit.cs:
* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Moved shorten type
  name method to compilation unit.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:07:30 UTC (rev 141005)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:40:15 UTC (rev 141006)
@@ -1,5 +1,11 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
+	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Moved shorten
+	  type name method to compilation unit.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Projects.Dom/DomUsing.cs:
 	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
 	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added some

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:07:30 UTC (rev 141005)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:40:15 UTC (rev 141006)
@@ -168,5 +168,38 @@
 				}
 			}
 		}
+		
+		public IReturnType ShortenTypeName (IReturnType fullyQualfiedType, DomLocation location)
+		{
+			return new ShortenTypeNameVistior (this, location).Visit (fullyQualfiedType, null) as IReturnType;
+		}
+		
+		class ShortenTypeNameVistior : CopyDomVisitor<object>
+		{
+			ICompilationUnit unit;
+			DomLocation location;
+			
+			public ShortenTypeNameVistior (ICompilationUnit unit, DomLocation location)
+			{
+				this.unit = unit;
+				this.location = location;
+			}
+			
+			public override IDomVisitable Visit (IReturnType type, object data)
+			{
+				IReturnType returnType = (IReturnType)base.Visit (type, data);
+				string longest = "";
+				foreach (IUsing u in unit.Usings.Where (u => ((!u.IsFromNamespace && u.Region.Start < location) || u.Region.Contains (location)))) {
+					foreach (string ns in u.Namespaces.Where (ns => returnType.Namespace == ns || returnType.Namespace.StartsWith (ns + "."))) {
+						if (longest.Length < ns.Length)
+							longest = ns;
+					}
+				}
+				if (longest.Length > 0) 
+					returnType.Namespace = returnType.Namespace == longest ? "" : returnType.Namespace.Substring (longest.Length + 1);
+				return returnType;
+			}
+		}
+		
 	}
 }

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 07:07:30 UTC (rev 141005)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 07:40:15 UTC (rev 141006)
@@ -62,5 +62,7 @@
 		
 		bool IsNamespaceUsedAt (string name, int line, int column);
 		bool IsNamespaceUsedAt (string name, DomLocation location);
+		
+		IReturnType ShortenTypeName (IReturnType fullyQualfiedType, DomLocation location);
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:40:51 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 03:40:51 -0400 (EDT)
Subject: [Mono-patches] r141007 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Ide: .
	MonoDevelop.Ide.CodeTemplates
Message-ID: <20090901074051.93FEC9472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 03:40:51 -0400 (Tue, 01 Sep 2009)
New Revision: 141007

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
Log:
* MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs: Now using (the
  more correct) shorten type name method from compilation unit.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 07:40:15 UTC (rev 141006)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 07:40:51 UTC (rev 141007)
@@ -1,3 +1,9 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs: Now using
+	  (the more correct) shorten type name method from compilation
+	  unit.
+
 2009-08-31  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* BuildVariables.cs:

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs	2009-09-01 07:40:15 UTC (rev 141006)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs	2009-09-01 07:40:51 UTC (rev 141007)
@@ -175,28 +175,10 @@
 		
 		public string GetSimpleTypeName (string fullTypeName)
 		{
-			IType foundType = null;
+			if (CurrentContext.ParsedDocument == null)
+				return fullTypeName;
 			
-			string curType = fullTypeName;
-			while (foundType == null) {
-				foundType = CurrentContext.ProjectDom.GetType (curType);
-				int idx = curType.LastIndexOf ('.');
-				if (idx < 0)
-					break; 
-				curType = fullTypeName.Substring (0, idx);
-			}
-			
-			if (foundType == null) 
-				foundType = new DomType (fullTypeName);
-			if (CurrentContext.ParsedDocument != null) {
-				foreach (IUsing u in CurrentContext.ParsedDocument.CompilationUnit.Usings) {
-					foreach (string includedNamespace in u.Namespaces) {
-						if (includedNamespace == foundType.Namespace)
-							return fullTypeName.Substring (includedNamespace.Length + 1);
-					}
-				}
-			}
-			return fullTypeName;
+			return CurrentContext.ParsedDocument.CompilationUnit.ShortenTypeName (new DomReturnType (fullTypeName), CurrentContext.InsertPosition).FullName;
 		}
 		
 		static Regex functionRegEx = new Regex ("([^(]*)\\(([^(]*)\\)", RegexOptions.Compiled);


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:51:26 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 03:51:26 -0400 (EDT)
Subject: [Mono-patches] r141008 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring: .
	MonoDevelop.CodeGeneration MonoDevelop.Refactoring
	MonoDevelop.Refactoring.DeclareLocal
Message-ID: <20090901075126.7A9F89472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 03:51:26 -0400 (Tue, 01 Sep 2009)
New Revision: 141008

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/CodeGenerationOptions.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/NullCheckGenerator.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Log:
* MonoDevelop.Refactoring/RefactoryCommands.cs:
* MonoDevelop.Refactoring/RefactoringOptions.cs:
* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
  Worked on refactoring/use shorten type name method.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 07:51:26 UTC (rev 141008)
@@ -1,5 +1,16 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Refactoring/RefactoryCommands.cs:
+	* MonoDevelop.Refactoring/RefactoringOptions.cs:
+	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
+	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
+	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
+	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
+	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
+	  Worked on refactoring/use shorten type name method.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Refactoring/RefactoryCommands.cs: ResolvedType
 	  is no longer used for the resolve namespace feature.
 	  Therefore replaced the check with an expression check.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/CodeGenerationOptions.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/CodeGenerationOptions.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/CodeGenerationOptions.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -71,22 +71,9 @@
 			return ProjectDomService.GetParser (Document.FileName, MimeType);
 		}
 		
-		public ICSharpCode.NRefactory.Ast.TypeReference MatchNamespaceImports (ICSharpCode.NRefactory.Ast.TypeReference typeReference)
+		public ICSharpCode.NRefactory.Ast.TypeReference ShortenTypeName (ICSharpCode.NRefactory.Ast.TypeReference typeReference)
 		{
-			string prefix = "";
-			foreach (IUsing u in Document.CompilationUnit.Usings) {
-				if (!u.IsFromNamespace || u.Region.Contains (Document.TextEditor.CursorLine, Document.TextEditor.CursorColumn)) {
-					foreach (string n in u.Namespaces) {
-						if (n.Length <= prefix.Length)
-							continue;
-						if (typeReference.Type.StartsWith (n + "."))
-							prefix = n;
-					}
-				}
-			}
-			if (!string.IsNullOrEmpty (prefix))
-				typeReference.Type = typeReference.Type.Substring (prefix.Length + 1);
-			return typeReference;
+			return Document.CompilationUnit.ShortenTypeName (typeReference.ConvertToReturnType (), Document.TextEditor.CursorLine, Document.TextEditor.CursorColumn).ConvertToTypeReference ();
 		}
 		
 		public IResolver GetResolver ()

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/NullCheckGenerator.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/NullCheckGenerator.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/NullCheckGenerator.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -97,7 +97,7 @@
 					        new PrimitiveExpression (null)
 					    ), new ThrowStatement (
 					    	new ObjectCreateExpression (
-					        	Options.MatchNamespaceImports (new TypeReference ("System.ArgumentNullException")),
+					        	Options.ShortenTypeName (new TypeReference ("System.ArgumentNullException")),
 					            new List<Expression> { new PrimitiveExpression (member.Name) }
 							)
 					    )

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -148,7 +148,7 @@
 						
 						List<Expression> arguments = new List<Expression> ();
 						foreach (IParameter parameter in method.Parameters) {
-							methodDeclaration.Parameters.Add (new ParameterDeclarationExpression (Options.MatchNamespaceImports (parameter.ReturnType.ConvertToTypeReference ()), parameter.Name, GetModifier (parameter)));
+							methodDeclaration.Parameters.Add (new ParameterDeclarationExpression (Options.ShortenTypeName (parameter.ReturnType.ConvertToTypeReference ()), parameter.Name, GetModifier (parameter)));
 							arguments.Add (new DirectionExpression (GetDirection (parameter), new IdentifierExpression (parameter.Name)));
 						}
 						
@@ -168,7 +168,7 @@
 					if (member is IProperty) {
 						IProperty property = (IProperty)member;
 						PropertyDeclaration propertyDeclaration = new PropertyDeclaration (modifier, null, member.Name, null);
-						propertyDeclaration.TypeReference = Options.MatchNamespaceImports (member.ReturnType.ConvertToTypeReference ());
+						propertyDeclaration.TypeReference = Options.ShortenTypeName (member.ReturnType.ConvertToTypeReference ());
 						if (property.HasGet) {
 							BlockStatement block = new BlockStatement ();
 							block.AddChild (isInterfaceMember ? throwNotImplemented : new ReturnStatement (baseReference));

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -107,11 +107,11 @@
 					IType type = Options.Dom.SearchType (new SearchTypeRequest (Options.Document.ParsedDocument.CompilationUnit, member.ReturnType, Options.EnclosingType));
 					IMethod invokeMethod = type.Methods.First ();
 
-					methodDeclaration.Parameters.Add (new ParameterDeclarationExpression (Options.MatchNamespaceImports (invokeMethod.Parameters[1].ReturnType.ConvertToTypeReference ()), invokeMethod.Parameters[1].Name));
+					methodDeclaration.Parameters.Add (new ParameterDeclarationExpression (Options.ShortenTypeName (invokeMethod.Parameters[1].ReturnType.ConvertToTypeReference ()), invokeMethod.Parameters[1].Name));
 					const string handlerName = "handler";
 					
 					LocalVariableDeclaration handlerVariable = new LocalVariableDeclaration (new VariableDeclaration (handlerName, new MemberReferenceExpression (new ThisReferenceExpression (), member.Name)));
-					handlerVariable.TypeReference = Options.MatchNamespaceImports (member.ReturnType.ConvertToTypeReference ());
+					handlerVariable.TypeReference = Options.ShortenTypeName (member.ReturnType.ConvertToTypeReference ());
 					methodDeclaration.Body.AddChild (handlerVariable);
 					
 					IfElseStatement ifStatement = new IfElseStatement (null);

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -139,10 +139,14 @@
 			return GetIndent (Document, member);
 		}
 		
+		public IReturnType ShortenTypeName (IReturnType fullyQualifiedTypeName)
+		{
+			return Document.ParsedDocument.CompilationUnit.ShortenTypeName (fullyQualifiedTypeName, Document.TextEditor.CursorLine, Document.TextEditor.CursorColumn);
+		}
+		
 		public ParsedDocument ParseDocument ()
 		{
 			return ProjectDomService.Parse (Dom.Project, Document.FileName, DesktopService.GetMimeTypeForUri (Document.FileName), Document.TextEditor.Text);
 		}
-		
 	}
 }

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -169,6 +169,7 @@
 					eitem = null;
 				}
 			}
+			
 			if (resolveResult != null  && resolveResult.ResolvedExpression != null && !string.IsNullOrEmpty (resolveResult.ResolvedExpression.Expression)) {
 				IReturnType returnType = new DomReturnType (resolveResult.ResolvedExpression.Expression);
 				List<string> namespaces = new List<string> (ctx.ResolvePossibleNamespaces (returnType));
@@ -181,11 +182,15 @@
 							info.Icon = MonoDevelop.Core.Gui.Stock.AddNamespace;
 						}
 						resolveMenu.CommandInfos.AddSeparator ();
+					} else {
+						// remove all unused namespaces (for resolving conflicts)
+						namespaces.RemoveAll (ns => !doc.CompilationUnit.IsNamespaceUsedAt (ns, resolveResult.ResolvedExpression.Region.Start));
 					}
+					
 					foreach (string ns in namespaces) {
 						resolveMenu.CommandInfos.Add (ns, new RefactoryOperation (new ResolveNameOperation (ctx, doc, resolveResult, ns).ResolveName));
 					}
-					if (namespaces.Count > 0)
+					if (namespaces.Count > (item == null ? 0 : 1))
 						ainfo.Add (resolveMenu, null);
 				}
 			}

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs	2009-09-01 07:40:51 UTC (rev 141007)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs	2009-09-01 07:51:26 UTC (rev 141008)
@@ -136,7 +136,10 @@
 			ResolveResult resolveResult;
 			LineSegment lineSegment;
 			if (data.IsSomethingSelected) {
-				resolveResult = resolver.Resolve (new ExpressionResult (data.SelectedText), new DomLocation (data.Caret.Line, data.Caret.Column));
+				ExpressionResult expressionResult = new ExpressionResult (data.SelectedText.Trim ());
+				if (expressionResult.Expression.Contains (" ") || expressionResult.Expression.Contains ("\t"))
+					expressionResult.Expression = "(" + expressionResult.Expression + ")";
+				resolveResult = resolver.Resolve (expressionResult, new DomLocation (data.Caret.Line, data.Caret.Column));
 				if (resolveResult == null)
 					return result;
 				string varName = CreateVariableName (resolveResult.ResolvedType);
@@ -144,11 +147,12 @@
 				if (resolveResult.ResolvedType == null) {
 					returnType = new TypeReference ("var");
 				} else {
-					returnType = resolveResult.ResolvedType.ConvertToTypeReference ();
+					
+					returnType = options.ShortenTypeName (resolveResult.ResolvedType).ConvertToTypeReference ();
 				}
 				options.ParseMember (resolveResult.CallingMember);
-				
-	/*			Statement lastStatement = null;
+	/*			
+				Statement lastStatement = null;
 				Location curLocation = new Location (data.Caret.Column, data.Caret.Line);
 				foreach (Statement statement in options.ParseMember (options.ResolveResult.CallingMember).Children) {
 					if (statement.StartLocation > curLocation) 
@@ -165,7 +169,7 @@
 				lineSegment = data.Document.GetLine (data.Caret.Line);
 				insert.Offset = lineSegment.Offset;
 				
-				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (ConvertToTypeRef (options, resolveResult.ResolvedType));
+				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (returnType);
 				varDecl.Variables.Add (new VariableDeclaration (varName, provider.ParseExpression (data.SelectedText)));
 				insert.InsertedText =  options.GetWhitespaces (lineSegment.Offset) +provider.OutputNode (options.Dom, varDecl) + Environment.NewLine;
 				result.Add (insert);
@@ -211,6 +215,8 @@
 
 		static string CreateVariableName (MonoDevelop.Projects.Dom.IReturnType returnType)
 		{
+			if (returnType == null)
+				return "aVar";
 			return "a" + returnType.Name;
 		}
 


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:51:56 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 03:51:56 -0400 (EDT)
Subject: [Mono-patches] r141009 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Dom
Message-ID: <20090901075156.E77D69472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 03:51:56 -0400 (Tue, 01 Sep 2009)
New Revision: 141009

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
Log:
* MonoDevelop.Projects.Dom/CompilationUnit.cs:
* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added shorten type
  name overload.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:51:26 UTC (rev 141008)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:51:56 UTC (rev 141009)
@@ -1,6 +1,12 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
+	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added shorten
+	  type name overload.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
 	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Moved shorten
 	  type name method to compilation unit.
 

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:51:26 UTC (rev 141008)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:51:56 UTC (rev 141009)
@@ -169,6 +169,12 @@
 			}
 		}
 		
+		
+		public IReturnType ShortenTypeName (IReturnType fullyQualfiedType, int line, int column)
+		{
+			return ShortenTypeName (fullyQualfiedType, new DomLocation (line, column));
+		}
+		
 		public IReturnType ShortenTypeName (IReturnType fullyQualfiedType, DomLocation location)
 		{
 			return new ShortenTypeNameVistior (this, location).Visit (fullyQualfiedType, null) as IReturnType;

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 07:51:26 UTC (rev 141008)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/ICompilationUnit.cs	2009-09-01 07:51:56 UTC (rev 141009)
@@ -64,5 +64,6 @@
 		bool IsNamespaceUsedAt (string name, DomLocation location);
 		
 		IReturnType ShortenTypeName (IReturnType fullyQualfiedType, DomLocation location);
+		IReturnType ShortenTypeName (IReturnType fullyQualfiedType, int line, int column);
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 03:56:40 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 03:56:40 -0400 (EDT)
Subject: [Mono-patches] r141010 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Dom
Message-ID: <20090901075640.6DED99472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 03:56:40 -0400 (Tue, 01 Sep 2009)
New Revision: 141010

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
Log:
* MonoDevelop.Projects.Dom/CompilationUnit.cs: Check if built in
  types are shortened (they don't need to).

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:51:56 UTC (rev 141009)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 07:56:40 UTC (rev 141010)
@@ -1,5 +1,10 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Projects.Dom/CompilationUnit.cs: Check if built
+	  in types are shortened (they don't need to).
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Projects.Dom/CompilationUnit.cs:
 	* MonoDevelop.Projects.Dom/ICompilationUnit.cs: Added shorten
 	  type name overload.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:51:56 UTC (rev 141009)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/CompilationUnit.cs	2009-09-01 07:56:40 UTC (rev 141010)
@@ -191,9 +191,18 @@
 				this.location = location;
 			}
 			
+			static HashSet<string> builtInTypes = new HashSet<string> (new string[] {
+				"System.Void", "System.Object","System.Boolean","System.Byte", "System.SByte",
+				"System.Char", "System.Enum", "System.Int16", "System.Int32", "System.Int64", 
+				"System.UInt16", "System.UInt32", "System.UInt64", "System.Single", "System.Double", "System.Decimal",
+				"System.String"
+			});
+			
 			public override IDomVisitable Visit (IReturnType type, object data)
 			{
 				IReturnType returnType = (IReturnType)base.Visit (type, data);
+				if (builtInTypes.Contains (returnType.FullName))
+					return returnType;
 				string longest = "";
 				foreach (IUsing u in unit.Usings.Where (u => ((!u.IsFromNamespace && u.Region.Start < location) || u.Region.Contains (location)))) {
 					foreach (string ns in u.Namespaces.Where (ns => returnType.Namespace == ns || returnType.Namespace.StartsWith (ns + "."))) {


From mono-patches-list at lists.ximian.com  Tue Sep  1 04:00:29 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 04:00:29 -0400 (EDT)
Subject: [Mono-patches] r141011 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring: .
	MonoDevelop.Refactoring.DeclareLocal
	MonoDevelop.Refactoring.ExtractMethod
Message-ID: <20090901080029.239519472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 04:00:29 -0400 (Tue, 01 Sep 2009)
New Revision: 141011

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs
Log:
* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
  Use shorten type name method.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 07:56:40 UTC (rev 141010)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 08:00:29 UTC (rev 141011)
@@ -1,5 +1,11 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
+	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
+	  Use shorten type name method.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Refactoring/RefactoryCommands.cs:
 	* MonoDevelop.Refactoring/RefactoringOptions.cs:
 	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs	2009-09-01 07:56:40 UTC (rev 141010)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs	2009-09-01 08:00:29 UTC (rev 141011)
@@ -81,40 +81,6 @@
 			return resolveResult.ResolvedType != null && !string.IsNullOrEmpty (resolveResult.ResolvedType.FullName) && resolveResult.ResolvedType.FullName != DomReturnType.Void.FullName;
 		}
 		
-		static HashSet<string> builtInTypes = new HashSet<string> (new string[] {
-			"System.Void", "System.Object","System.Boolean","System.Byte", "System.SByte",
-			"System.Char", "System.Enum", "System.Int16", "System.Int32", "System.Int64", 
-			"System.UInt16", "System.UInt32", "System.UInt64", "System.Single", "System.Double", "System.Decimal",
-			"System.String"
-		});
-		
-		public string GetSimpleTypeName (RefactoringOptions options, string fullTypeName)
-		{
-			if (builtInTypes.Contains (fullTypeName))
-				return fullTypeName;
-			IType foundType = null;
-			string curType = fullTypeName;
-			while (foundType == null) {
-				foundType = options.Dom.GetType (curType);
-				int idx = curType.LastIndexOf ('.');
-				if (idx < 0)
-					break;
-				curType = fullTypeName.Substring (0, idx);
-			}
-
-			if (foundType == null)
-				foundType = new DomType (fullTypeName);
-			if (options.Document.ParsedDocument != null) {
-				foreach (IUsing u in options.Document.ParsedDocument.CompilationUnit.Usings) {
-					foreach (string includedNamespace in u.Namespaces) {
-						if (includedNamespace == foundType.Namespace)
-							return fullTypeName.Substring (includedNamespace.Length + 1);
-					}
-				}
-			}
-			return fullTypeName;
-		}
-		
 		public override void Run (RefactoringOptions options)
 		{
 			base.Run (options);
@@ -201,7 +167,7 @@
 				insert.Description = GettextCatalog.GetString ("Insert variable declaration");
 				insert.Offset = lineSegment.Offset + options.GetWhitespaces (lineSegment.Offset).Length;
 				string varName = CreateVariableName (resolveResult.ResolvedType);
-				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (ConvertToTypeRef (options, resolveResult.ResolvedType));
+				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (options.ShortenTypeName (resolveResult.ResolvedType).ConvertToTypeReference ());
 				varDecl.Variables.Add (new VariableDeclaration (varName, expression));
 				insert.RemovedChars = expression.EndLocation.Column - 1;
 				insert.InsertedText = provider.OutputNode (options.Dom, varDecl);
@@ -220,16 +186,5 @@
 			return "a" + returnType.Name;
 		}
 
-
-		TypeReference ConvertToTypeRef (RefactoringOptions options, MonoDevelop.Projects.Dom.IReturnType returnType)
-		{
-			TypeReference result = new TypeReference (GetSimpleTypeName (options, returnType.FullName));
-			result.IsKeyword = true;
-			foreach (IReturnType generic in returnType.GenericArguments) {
-				result.GenericTypes.Add (ConvertToTypeRef (options, generic));
-			}
-			return result;
-		}
-
 	}
 }

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs	2009-09-01 07:56:40 UTC (rev 141010)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs	2009-09-01 08:00:29 UTC (rev 141011)
@@ -230,7 +230,7 @@
 				varGen.Offset = line.Offset + line.EditableLength;
 				varGen.InsertedText = Environment.NewLine + options.GetWhitespaces (line.Offset);
 				foreach (VariableDescriptor var in variablesToGenerate) {
-					TypeReference tr = var.ReturnType.ConvertToTypeReference ();
+					TypeReference tr = options.ShortenTypeName (var.ReturnType).ConvertToTypeReference ();
 					varGen.InsertedText += provider.OutputNode (options.Dom, new LocalVariableDeclaration (new VariableDeclaration (var.Name, null, tr)));
 				}
 				result.Add (varGen);
@@ -259,7 +259,7 @@
 			INode outputNode;
 			if (oneChangedVariable) {
 				string name = param.ChangedVariables.First ();
-				returnType = param.Variables.Find (v => v.Name == name).ReturnType.ConvertToTypeReference ();
+				returnType = options.ShortenTypeName (param.Variables.Find (v => v.Name == name).ReturnType).ConvertToTypeReference ();
 				if (visitor.VariableList.Any (v => v.Name == name && !v.IsDefined)) {
 					LocalVariableDeclaration varDecl = new LocalVariableDeclaration (returnType);
 					varDecl.Variables.Add (new VariableDeclaration (name, invocation));
@@ -296,7 +296,7 @@
 			node.AcceptVisitor (transformer, null);
 			if (!oneChangedVariable && node is Expression) {
 				ResolveResult resolveResult = resolver.Resolve (new ExpressionResult (text), new DomLocation (options.Document.TextEditor.CursorLine, options.Document.TextEditor.CursorColumn));
-				returnType = resolveResult.ResolvedType.ConvertToTypeReference ();
+				returnType = options.ShortenTypeName (resolveResult.ResolvedType).ConvertToTypeReference ();
 			}
 			
 			MethodDeclaration methodDecl = new MethodDeclaration ();
@@ -317,13 +317,13 @@
 
 			foreach (VariableDescriptor var in variablesToDefine) {
 				BlockStatement block = methodDecl.Body;
-				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (var.ReturnType.ConvertToTypeReference());
+				LocalVariableDeclaration varDecl = new LocalVariableDeclaration (options.ShortenTypeName (var.ReturnType).ConvertToTypeReference());
 				varDecl.Variables.Add (new VariableDeclaration (var.Name));
 				block.Children.Insert (0, varDecl);
 			}
 			
 			foreach (VariableDescriptor var in param.Parameters) {
-				TypeReference typeReference = var.ReturnType.ConvertToTypeReference ();
+				TypeReference typeReference = options.ShortenTypeName (var.ReturnType).ConvertToTypeReference ();
 				ParameterDeclarationExpression pde = new ParameterDeclarationExpression (typeReference, var.Name);
 				if (!oneChangedVariable && param.ChangedVariables.Contains (var.Name))
 					pde.ParamModifier |= ICSharpCode.NRefactory.Ast.ParameterModifiers.Ref;
@@ -331,7 +331,7 @@
 			}
 
 			foreach (VariableDescriptor var in variablesToGenerate) {
-				TypeReference typeReference = var.ReturnType.ConvertToTypeReference ();
+				TypeReference typeReference = options.ShortenTypeName (var.ReturnType).ConvertToTypeReference ();
 				ParameterDeclarationExpression pde = new ParameterDeclarationExpression (typeReference, var.Name);
 				if (!oneChangedVariable && param.ChangedVariables.Contains (var.Name))
 					pde.ParamModifier |= ICSharpCode.NRefactory.Ast.ParameterModifiers.Out;


From mono-patches-list at lists.ximian.com  Tue Sep  1 04:13:44 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 04:13:44 -0400 (EDT)
Subject: [Mono-patches] r141012 - in
	trunk/monodevelop/main/src/addins/CSharpBinding: . Gui
Message-ID: <20090901081344.CE0D39472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 04:13:44 -0400 (Tue, 01 Sep 2009)
New Revision: 141012

Modified:
   trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
   trunk/monodevelop/main/src/addins/CSharpBinding/Gui/NRefactoryResolver.cs
Log:
* Gui/NRefactoryResolver.cs: Fixed "Bug 535187 - Resolver result
  wrong when property name matches type".

Modified: trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog	2009-09-01 08:00:29 UTC (rev 141011)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog	2009-09-01 08:13:44 UTC (rev 141012)
@@ -1,3 +1,8 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* Gui/NRefactoryResolver.cs: Fixed "Bug 535187 - Resolver
+	  result wrong when property name matches type".
+
 2009-08-31  Mike Kr?ger  <mkrueger at novell.com>
 
 	* Parser/CodeGenerator.cs: Fixed unit tests.

Modified: trunk/monodevelop/main/src/addins/CSharpBinding/Gui/NRefactoryResolver.cs
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/Gui/NRefactoryResolver.cs	2009-09-01 08:00:29 UTC (rev 141011)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/Gui/NRefactoryResolver.cs	2009-09-01 08:13:44 UTC (rev 141012)
@@ -749,8 +749,26 @@
 					goto end;
 				}
 			}
-			
 			if (this.callingMember != null) {
+				
+				// special handling of property return types, they can have the same name as the return type
+				// ex.: MyType MyType { get; set; }
+				if (callingMember is IProperty && identifier == callingMember.Name) {
+					int pos = editor.GetPositionFromLineColumn (resolvePosition.Line, resolvePosition.Column);
+					while (pos < editor.TextLength && !Char.IsWhiteSpace (editor.GetCharAt (pos)))
+						pos++;
+					while (pos < editor.TextLength && Char.IsWhiteSpace (editor.GetCharAt (pos)))
+						pos++;
+					StringBuilder memberName = new StringBuilder ();
+					while (pos < editor.TextLength && !Char.IsWhiteSpace (editor.GetCharAt (pos))) {
+						memberName.Append (editor.GetCharAt (pos));
+						pos++;
+					}
+					if (memberName.ToString () == identifier) {
+						result = visitor.CreateResult (callingMember.ReturnType);
+						goto end;
+					}
+				}
 				if (identifier == "value" && this.callingMember is IProperty) {
 					result = new MemberResolveResult (this.callingMember);
 					result.UnresolvedType = ((IProperty)this.callingMember).ReturnType;


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:06:02 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 05:06:02 -0400 (EDT)
Subject: [Mono-patches] r141013 - in
	trunk/monodevelop/main/src/addins/CSharpBinding: . Parser
Message-ID: <20090901090602.3BCAE9472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 05:06:02 -0400 (Tue, 01 Sep 2009)
New Revision: 141013

Modified:
   trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
   trunk/monodevelop/main/src/addins/CSharpBinding/Parser/CSharpNRefactoryASTProvider.cs
Log:
* Parser/CSharpNRefactoryASTProvider.cs: Implementet
  parsetypereference.

Modified: trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog	2009-09-01 08:13:44 UTC (rev 141012)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog	2009-09-01 09:06:02 UTC (rev 141013)
@@ -1,5 +1,10 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* Parser/CSharpNRefactoryASTProvider.cs: Implementet
+	  parsetypereference.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* Gui/NRefactoryResolver.cs: Fixed "Bug 535187 - Resolver
 	  result wrong when property name matches type".
 

Modified: trunk/monodevelop/main/src/addins/CSharpBinding/Parser/CSharpNRefactoryASTProvider.cs
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/Parser/CSharpNRefactoryASTProvider.cs	2009-09-01 08:13:44 UTC (rev 141012)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/Parser/CSharpNRefactoryASTProvider.cs	2009-09-01 09:06:02 UTC (rev 141013)
@@ -96,6 +96,17 @@
 				return parser.CompilationUnit;
 			}
 		}
-		
+
+		public TypeReference ParseTypeReference (string content)
+		{
+			content = content.Trim ();
+			using (ICSharpCode.NRefactory.IParser parser = ICSharpCode.NRefactory.ParserFactory.CreateParser (SupportedLanguage.CSharp, new StringReader (content))) {
+				try {
+					return parser.ParseTypeReference ();
+				} catch (Exception) {
+				}
+			}
+			return null;
+		}
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:07:16 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 05:07:16 -0400 (EDT)
Subject: [Mono-patches] r141014 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring: .
	MonoDevelop.Refactoring
Message-ID: <20090901090716.BF95E9472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 05:07:16 -0400 (Tue, 01 Sep 2009)
New Revision: 141014

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/INRefactoryASTProvider.cs
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Log:
* MonoDevelop.Refactoring/RefactoryCommands.cs:
* MonoDevelop.Refactoring/INRefactoryASTProvider.cs: Resolve type now
  works with templates with >=2 type arguments.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 09:06:02 UTC (rev 141013)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 09:07:16 UTC (rev 141014)
@@ -1,5 +1,11 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Refactoring/RefactoryCommands.cs:
+	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs: Resolve
+	  type now works with templates with >=2 type arguments.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
 	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
 	  Use shorten type name method.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/INRefactoryASTProvider.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/INRefactoryASTProvider.cs	2009-09-01 09:06:02 UTC (rev 141013)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/INRefactoryASTProvider.cs	2009-09-01 09:07:16 UTC (rev 141014)
@@ -31,7 +31,6 @@
 using System.IO;
 using MonoDevelop.Projects.Dom.Parser;
 
-
 namespace MonoDevelop.Refactoring
 {
 	public interface INRefactoryASTProvider
@@ -42,6 +41,7 @@
 		INode ParseText (string text);
 		Expression ParseExpression (string expressionText);
 		CompilationUnit ParseFile (string content);
+		TypeReference ParseTypeReference (string typeText);
 		
 		bool CanGenerateASTFrom (string mimeType);
 	}

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 09:06:02 UTC (rev 141013)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs	2009-09-01 09:07:16 UTC (rev 141014)
@@ -171,7 +171,13 @@
 			}
 			
 			if (resolveResult != null  && resolveResult.ResolvedExpression != null && !string.IsNullOrEmpty (resolveResult.ResolvedExpression.Expression)) {
-				IReturnType returnType = new DomReturnType (resolveResult.ResolvedExpression.Expression);
+				
+				IReturnType returnType = null; 
+				INRefactoryASTProvider astProvider = RefactoringService.GetASTProvider (MonoDevelop.Core.Gui.DesktopService.GetMimeTypeForUri (doc.FileName));
+				if (astProvider != null) 
+					returnType = astProvider.ParseTypeReference (resolveResult.ResolvedExpression.Expression).ConvertToReturnType ();
+				if (returnType == null)
+					returnType = DomReturnType.FromInvariantString (resolveResult.ResolvedExpression.Expression);
 				List<string> namespaces = new List<string> (ctx.ResolvePossibleNamespaces (returnType));
 				if (item == null || namespaces.Count > 1) {
 					CommandInfoSet resolveMenu = new CommandInfoSet ();


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:35:31 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 05:35:31 -0400 (EDT)
Subject: [Mono-patches] r141015 -
	trunk/monodevelop/main/src/core/MonoDevelop.Dock
Message-ID: <20090901093531.436E39472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 05:35:31 -0400 (Tue, 01 Sep 2009)
New Revision: 141015

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs
Log:
* DockItem.cs: Fire the ContentRequired event only when the content
  is really required, that is, when it is going to be shown. It won't
  be fired for example, if the pad is selected but not visible in a
  notebook.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog	2009-09-01 09:07:16 UTC (rev 141014)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog	2009-09-01 09:35:31 UTC (rev 141015)
@@ -1,3 +1,10 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* DockItem.cs: Fire the ContentRequired event only when the
+	  content is really required, that is, when it is going to be
+	  shown. It won't be fired for example, if the pad is selected
+	  but not visible in a notebook.
+
 2009-08-27  Mike Kr?ger  <mkrueger at novell.com>
 
 	* TabStrip.cs:

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs	2009-09-01 09:07:16 UTC (rev 141014)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs	2009-09-01 09:35:31 UTC (rev 141015)
@@ -120,30 +120,40 @@
 			get {
 				if (widget == null) {
 					widget = new DockItemContainer (frame, this);
+					widget.Visible = false; // Required to ensure that the Shown event is fired
 					widget.Label = label;
-					if (ContentRequired != null) {
-						gettingContent = true;
-						try {
-							ContentRequired (this, EventArgs.Empty);
-						} finally {
-							gettingContent = false;
-						}
-					}
-					widget.UpdateContent ();
-					widget.Shown += delegate {
-						UpdateContentVisibleStatus ();
-					};
-					widget.Hidden += delegate {
-						UpdateContentVisibleStatus ();
-					};
-					widget.ParentSet += delegate {
-						UpdateContentVisibleStatus ();
-					};
+					widget.Shown += SetupContent;
 				}
 				return widget;
 			}
 		}
 		
+		void SetupContent (object ob, EventArgs args)
+		{
+			widget.Shown -= SetupContent;
+			
+			if (ContentRequired != null) {
+				gettingContent = true;
+				try {
+					ContentRequired (this, EventArgs.Empty);
+				} finally {
+					gettingContent = false;
+				}
+			}
+
+			widget.UpdateContent ();
+			widget.Shown += delegate {
+				UpdateContentVisibleStatus ();
+			};
+			widget.Hidden += delegate {
+				UpdateContentVisibleStatus ();
+			};
+			widget.ParentSet += delegate {
+				UpdateContentVisibleStatus ();
+			};
+			UpdateContentVisibleStatus ();
+		}
+		
 		public Widget Content {
 			get {
 				return content;


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:37:50 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 05:37:50 -0400 (EDT)
Subject: [Mono-patches] r141016 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui: .
	MonoDevelop.Projects.Gui.Dialogs.OptionPanels
Message-ID: <20090901093750.BE85E9472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 05:37:50 -0400 (Tue, 01 Sep 2009)
New Revision: 141016

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs
Log:
2009-09-01  Christian Hergert  <chris at dronelabs.com>

	* MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs:
	  Fix NRE.



Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/ChangeLog	2009-09-01 09:35:31 UTC (rev 141015)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
@@ -1,3 +1,8 @@
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
+	* MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs:
+	  Fix NRE.
+
 2009-08-27  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs:

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs	2009-09-01 09:35:31 UTC (rev 141015)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CodeFormattingPanel.cs	2009-09-01 09:37:50 UTC (rev 141016)
@@ -182,7 +182,7 @@
 		
 		public bool IsUserMimeType (string type)
 		{
-			return globalMimeTypes.Contains (type);
+			return globalMimeTypes != null && globalMimeTypes.Contains (type);
 		}
 		
 		void GetItemMimeTypes (HashSet<string> types, SolutionItem item)


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:50:58 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 05:50:58 -0400 (EDT)
Subject: [Mono-patches] r141017 - in trunk/mono-addins: . Mono.Addins
	Mono.Addins.CecilReflector Mono.Addins.Gui
	Mono.Addins.MSBuild Mono.Addins.Setup
Message-ID: <20090901095058.D1DF69472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 05:50:58 -0400 (Tue, 01 Sep 2009)
New Revision: 141017

Modified:
   trunk/mono-addins/ChangeLog
   trunk/mono-addins/Mono.Addins.CecilReflector/AssemblyInfo.cs
   trunk/mono-addins/Mono.Addins.CecilReflector/ChangeLog
   trunk/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs
   trunk/mono-addins/Mono.Addins.Gui/ChangeLog
   trunk/mono-addins/Mono.Addins.MSBuild/AssemblyInfo.cs
   trunk/mono-addins/Mono.Addins.MSBuild/ChangeLog
   trunk/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs
   trunk/mono-addins/Mono.Addins.Setup/ChangeLog
   trunk/mono-addins/Mono.Addins/AssemblyInfo.cs
   trunk/mono-addins/Mono.Addins/ChangeLog
   trunk/mono-addins/configure.ac
Log:
* configure.ac:
* Mono.Addins/AssemblyInfo.cs:
* Mono.Addins.Gui/AssemblyInfo.cs:
* Mono.Addins.Setup/AssemblyInfo.cs:
* Mono.Addins.MSBuild/AssemblyInfo.cs:
* Mono.Addins.CecilReflector/AssemblyInfo.cs: Bump Mono.Addins
  version.

Modified: trunk/mono-addins/ChangeLog
===================================================================
--- trunk/mono-addins/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* configure.ac: Bump Mono.Addins version.
+
 2009-08-25  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Mono.Addins.sln: Disable some projects on windows.

Modified: trunk/mono-addins/Mono.Addins/AssemblyInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/AssemblyInfo.cs	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins/AssemblyInfo.cs	2009-09-01 09:50:58 UTC (rev 141017)
@@ -17,4 +17,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]

Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* AssemblyInfo.cs: Bump Mono.Addins version.
+
 2009-08-20  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Makefile.am: Added a new project which Implements an msbuild

Modified: trunk/mono-addins/Mono.Addins.CecilReflector/AssemblyInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.CecilReflector/AssemblyInfo.cs	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.CecilReflector/AssemblyInfo.cs	2009-09-01 09:50:58 UTC (rev 141017)
@@ -17,4 +17,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]

Modified: trunk/mono-addins/Mono.Addins.CecilReflector/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.CecilReflector/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.CecilReflector/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* AssemblyInfo.cs: Bump Mono.Addins version.
+
 2009-08-19  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Mono.Addins.CecilReflector.csproj: Update target framework

Modified: trunk/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs	2009-09-01 09:50:58 UTC (rev 141017)
@@ -17,4 +17,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]

Modified: trunk/mono-addins/Mono.Addins.Gui/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.Gui/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* AssemblyInfo.cs: Bump Mono.Addins version.
+
 2009-08-20  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Makefile.am: Build using gmcs.

Modified: trunk/mono-addins/Mono.Addins.MSBuild/AssemblyInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.MSBuild/AssemblyInfo.cs	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.MSBuild/AssemblyInfo.cs	2009-09-01 09:50:58 UTC (rev 141017)
@@ -42,7 +42,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

Modified: trunk/mono-addins/Mono.Addins.MSBuild/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.MSBuild/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.MSBuild/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* AssemblyInfo.cs: Bump Mono.Addins version.
+
 2009-08-25  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Mono.Addins.MSBuild.csproj: Added Default configuration.

Modified: trunk/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs	2009-09-01 09:50:58 UTC (rev 141017)
@@ -17,4 +17,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]

Modified: trunk/mono-addins/Mono.Addins.Setup/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.Setup/ChangeLog	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/Mono.Addins.Setup/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,3 +1,7 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* AssemblyInfo.cs: Bump Mono.Addins version.
+
 2009-08-25  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Mono.Addins.Setup/PcFileCache.cs: Updated from MD.

Modified: trunk/mono-addins/configure.ac
===================================================================
--- trunk/mono-addins/configure.ac	2009-09-01 09:37:50 UTC (rev 141016)
+++ trunk/mono-addins/configure.ac	2009-09-01 09:50:58 UTC (rev 141017)
@@ -1,7 +1,7 @@
 dnl Warning: This is an automatically generated file, do not edit!
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT([mono-addins], [0.4])
+AC_INIT([mono-addins], [0.5])
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_MAINTAINER_MODE
 
@@ -11,9 +11,9 @@
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-API_VERSION=0.4.0.0
+API_VERSION=0.5.0.0
 AC_SUBST(API_VERSION)
-POLICY_VERSIONS="0.2 0.3"
+POLICY_VERSIONS="0.2 0.3 0.4"
 AC_SUBST(POLICY_VERSIONS)
 
 AC_PROG_INSTALL


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:52:44 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 05:52:44 -0400 (EDT)
Subject: [Mono-patches] r141018 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: . PyBinding.Parser
Message-ID: <20090901095244.C71879472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 05:52:44 -0400 (Tue, 01 Sep 2009)
New Revision: 141018

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser/ParserDatabase.cs
Log:
* PyBinding.Parser/ParserDatabase.cs: Handle the case where there is
  no completion database created.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 09:50:58 UTC (rev 141017)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 09:52:44 UTC (rev 141018)
@@ -1,3 +1,8 @@
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
+	* PyBinding.Parser/ParserDatabase.cs: Handle the case where
+	  there is no completion database created.
+
 2009-08-28  Christian Hergert  <chris at dronelabs.com>
 
 	* Resources/EmptyPyProject.xpt.xml: Open main.py by default

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser/ParserDatabase.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser/ParserDatabase.cs	2009-09-01 09:50:58 UTC (rev 141017)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser/ParserDatabase.cs	2009-09-01 09:52:44 UTC (rev 141018)
@@ -71,7 +71,9 @@
 		
 		bool NeedsUpgrade {
 			get {
-				if (!File.Exists (VersionFile))
+				if (!File.Exists (m_FileName))
+					return false;
+				else if (!File.Exists (VersionFile))
 					return true;
 				int version;
 				string content = File.ReadAllText (VersionFile).Trim ();
@@ -100,8 +102,10 @@
 				// Backup if needed
 				var backup = m_FileName + ".bak";
 				var needsUpgrade = NeedsUpgrade;
-				if (needsUpgrade)
+				if (needsUpgrade && File.Exists (m_FileName))
 					File.Move (m_FileName, backup);
+				else if (!File.Exists (m_FileName))
+					File.WriteAllText (VersionFile, String.Format ("{0}", s_version));
 				
 				// Build
 				m_conn = new SqliteConnection (connString);
@@ -109,7 +113,7 @@
 				EnsureTables ();
 				
 				if (needsUpgrade) {
-					File.WriteAllText (m_FileName + ".version", String.Format ("{0}", s_version));
+					File.WriteAllText (VersionFile, String.Format ("{0}", s_version));
 					
 					// Open backup database
 					var conn = new SqliteConnection (ConnStrForFile (backup));
@@ -125,7 +129,9 @@
 						
 						conn.Close ();
 						conn.Dispose ();
-						File.Delete (backup);
+						
+						if (File.Exists (backup))
+							File.Delete (backup);
 					});
 				}
 			}
@@ -257,7 +263,7 @@
 		
 		void EnsureTables ()
 		{
-			string schemaSql = String.Empty;
+			string schemaSql;
 			
 			using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream ("Schema.sql"))
 				using (var reader = new StreamReader (stream))


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:53:15 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 05:53:15 -0400 (EDT)
Subject: [Mono-patches] r141019 -
	trunk/monodevelop/extras/MonoDevelop.AddinAuthoring
Message-ID: <20090901095315.0CF2E9472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 05:53:14 -0400 (Tue, 01 Sep 2009)
New Revision: 141019

Modified:
   trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/ChangeLog
   trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/configure
Log:
* configure: Bump mono-addins dependency.

Modified: trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/ChangeLog
===================================================================
--- trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/ChangeLog	2009-09-01 09:52:44 UTC (rev 141018)
+++ trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/ChangeLog	2009-09-01 09:53:14 UTC (rev 141019)
@@ -1,5 +1,9 @@
 2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
 
+	* configure: Bump mono-addins dependency.
+
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
 	* configure: Updated deps.
 
 2009-08-21  Lluis Sanchez Gual  <lluis at novell.com>

Modified: trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/configure
===================================================================
--- trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/configure	2009-09-01 09:52:44 UTC (rev 141018)
+++ trunk/monodevelop/extras/MonoDevelop.AddinAuthoring/configure	2009-09-01 09:53:14 UTC (rev 141019)
@@ -4,7 +4,7 @@
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;2.1.0 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.4"
+common_packages=" monodevelop;2.1.0 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
 
 
 usage ()


From mono-patches-list at lists.ximian.com  Tue Sep  1 05:54:56 2009
From: mono-patches-list at lists.ximian.com (Raja R Harinath (rharinath@novell.com))
Date: Tue,  1 Sep 2009 05:54:56 -0400 (EDT)
Subject: [Mono-patches] r141020 - in trunk/mcs/class/System: System
	Test/System
Message-ID: <20090901095456.B77E19472C@mono-cvs.ximian.com>

Author: raja
Date: 2009-09-01 05:54:56 -0400 (Tue, 01 Sep 2009)
New Revision: 141020

Modified:
   trunk/mcs/class/System/System/ChangeLog
   trunk/mcs/class/System/System/Uri.cs
   trunk/mcs/class/System/Test/System/ChangeLog
   trunk/mcs/class/System/Test/System/UriTest.cs
Log:
Fix #533572

* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.

2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
	* UriTest.cs: New tests from #533572.

Modified: trunk/mcs/class/System/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/System/ChangeLog	2009-09-01 09:53:14 UTC (rev 141019)
+++ trunk/mcs/class/System/System/ChangeLog	2009-09-01 09:54:56 UTC (rev 141020)
@@ -1,3 +1,8 @@
+2009-09-01  Raja R Harinath  <harinath at hurrynot.org>
+
+	Fix #533572
+	* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.
+
 2009-05-16  Sebastien Pouliot  <sebastien at ximian.com>
 
 	* Uri.cs (NET_2_1): Remove some extra code for NET_2_1
@@ -7,7 +12,7 @@
 	* UriParser.cs: Don't use compiled regex on NET_2_1 (feature is
 	not available)
 
-2009-04-21  Sebastien Pouliot  <sebastien at ximian.com> 
+2009-04-21  Sebastien Pouliot  <sebastien at ximian.com>
 
 	* DefaultUriParser.cs: Add special case for schema
 	* Uri.cs: Make sure we can use a default parser if none was

Modified: trunk/mcs/class/System/System/Uri.cs
===================================================================
--- trunk/mcs/class/System/System/Uri.cs	2009-09-01 09:53:14 UTC (rev 141019)
+++ trunk/mcs/class/System/System/Uri.cs	2009-09-01 09:54:56 UTC (rev 141020)
@@ -1505,7 +1505,10 @@
 			}
 
 			// 4.a user info
-			pos = uriString.IndexOf ('@', startpos, endpos-startpos);
+			if (unixAbsPath)
+				pos = -1;
+			else
+				pos = uriString.IndexOf ('@', startpos, endpos-startpos);
 			if (pos != -1) {
 				userinfo = uriString.Substring (startpos, pos-startpos);
 				startpos = pos + 1;

Modified: trunk/mcs/class/System/Test/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/System/ChangeLog	2009-09-01 09:53:14 UTC (rev 141019)
+++ trunk/mcs/class/System/Test/System/ChangeLog	2009-09-01 09:54:56 UTC (rev 141020)
@@ -1,3 +1,7 @@
+2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
+
+	* UriTest.cs: New tests from #533572.
+
 2009-06-25  Robert Jordan  <robertj at gmx.net>
 
 	* UriTest.cs: Upgrade to new NUnit style.
@@ -2,3 +6,3 @@
 
-2009-04-21  Sebastien Pouliot  <sebastien at ximian.com> 
+2009-04-21  Sebastien Pouliot  <sebastien at ximian.com>
 

Modified: trunk/mcs/class/System/Test/System/UriTest.cs
===================================================================
--- trunk/mcs/class/System/Test/System/UriTest.cs	2009-09-01 09:53:14 UTC (rev 141019)
+++ trunk/mcs/class/System/Test/System/UriTest.cs	2009-09-01 09:54:56 UTC (rev 141020)
@@ -23,7 +23,7 @@
 		protected bool isWin32 = false;
 
 		[TestFixtureSetUp]
-		public void GetReady () 
+		public void GetReady ()
 		{
 			isWin32 = (Path.DirectorySeparatorChar == '\\');
 		}
@@ -45,21 +45,21 @@
 
 			uri = new Uri("http://[11:22:33::88]:9090");
 			Print (uri);
-			
+
 			uri = new Uri("http://[::127.11.22.33]:8080");
 			Print (uri);
-			
+
 			uri = new Uri("http://[abcde::127.11.22.33]:8080");
-			Print (uri);			
+			Print (uri);
 			*/
-			
+
 			/*
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar/");
 			Print (uri);
 
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar");
 			Print (uri);
-			
+
 			uri = new Uri ("http://www.contoso.com:1234/");
 			Print (uri);
 
@@ -110,7 +110,7 @@
 
 			uri = new Uri("myscheme://127.0.0.1:5");
 			Assert.AreEqual ("myscheme://127.0.0.1:5/", uri.ToString(), "#c1");
-			
+
 			uri = new Uri (@"\\myserver\mydir\mysubdir\myfile.ext");
 			Assert.AreEqual ("/mydir/mysubdir/myfile.ext", uri.AbsolutePath, "#n1");
 			Assert.AreEqual ("file://myserver/mydir/mysubdir/myfile.ext", uri.AbsoluteUri, "#n2");
@@ -135,7 +135,7 @@
 			Assert.AreEqual ("file", uri.Scheme, "#n15");
 			Assert.AreEqual (false, uri.UserEscaped, "#n16");
 			Assert.AreEqual ("", uri.UserInfo, "#n17");
-			
+
 			uri = new Uri (new Uri("http://www.contoso.com"), "Hello World.htm", true);
 			Assert.AreEqual ("http://www.contoso.com/Hello World.htm", uri.AbsoluteUri, "#rel1a");
 			Assert.AreEqual (true, uri.UserEscaped, "#rel1b");
@@ -434,7 +434,7 @@
 			Assert.AreEqual ("foo", u.Host, "#7a");
 			Assert.AreEqual (UriHostNameType.Dns, u.HostNameType, "#7b");
 			Assert.AreEqual ("file://foo/bar", u.ToString (), "#7c");
-			Assert.AreEqual (true, u.IsUnc, "#7d"); 
+			Assert.AreEqual (true, u.IsUnc, "#7d");
 
 			Assert.AreEqual ("file://foo/bar", new Uri ("file://///foo/bar").ToString(), "#9");
 
@@ -480,7 +480,7 @@
 		{
 			new Uri ("http:a");
 		}
-		
+
 		[Test]
 		[ExpectedException (typeof (UriFormatException))]
 		public void HttpHostname3 ()
@@ -587,7 +587,7 @@
 			Assert.AreEqual ("file", uri.Scheme, "#1c");
 			Assert.AreEqual ("", uri.Host, "#1d");
 			Assert.AreEqual ("c:/tmp/hello.txt", uri.AbsolutePath, "#1e");
-					
+
 			uri = new Uri ("file:////////cygwin/tmp/hello.txt");
 			Assert.AreEqual ("file://cygwin/tmp/hello.txt", uri.ToString (), "#3a");
 			if (isWin32)
@@ -607,7 +607,7 @@
 			Assert.AreEqual ("file", uri.Scheme, "#4c");
 			Assert.AreEqual ("mymachine", uri.Host, "#4d");
 			Assert.AreEqual ("/cygwin/tmp/hello.txt", uri.AbsolutePath, "#4e");
-			
+
 			uri = new Uri ("file://///c:/cygwin/tmp/hello.txt");
 			Assert.AreEqual ("file:///c:/cygwin/tmp/hello.txt", uri.ToString (), "#5a");
 			Assert.AreEqual ("c:\\cygwin\\tmp\\hello.txt", uri.LocalPath, "#5b");
@@ -709,30 +709,30 @@
 		{
 			Uri u1 = new Uri("http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx");
 			Uri u2 = new Uri("http://localhost:8080/test.aspx?ReturnUrl=%252fSearchDoc%252fSearcher.aspx");
-			
+
 			Assert.AreEqual (u1.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=/SearchDoc/Searcher.aspx", "QE1");
 			Assert.AreEqual (u2.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx", "QE2");
 		}
-		
+
 		[Test]
 		public void UnixPath () {
 			if (!isWin32)
 				Assert.AreEqual ("file:///cygwin/tmp/hello.txt", new Uri ("/cygwin/tmp/hello.txt").ToString (), "#6a");
 		}
-		
+
 		[Test]
 		public void Unc ()
 		{
 			Uri uri = new Uri ("http://www.contoso.com");
 			Assert.IsTrue (!uri.IsUnc, "#1");
-			
+
 			uri = new Uri ("news:123456 at contoso.com");
 			Assert.IsTrue (!uri.IsUnc, "#2");
 
 			uri = new Uri ("file://server/filename.ext");
 			Assert.IsTrue (uri.IsUnc, "#3");
 
-			uri = new Uri (@"\\server\share\filename.ext");			
+			uri = new Uri (@"\\server\share\filename.ext");
 			Assert.IsTrue (uri.IsUnc, "#6");
 
 			uri = new Uri (@"a:\dir\filename.ext");
@@ -750,7 +750,7 @@
 		}
 
 		[Test]
-		public void FromHex () 
+		public void FromHex ()
 		{
 			Assert.AreEqual (0, Uri.FromHex ('0'), "#1");
 			Assert.AreEqual (9, Uri.FromHex ('9'), "#2");
@@ -801,28 +801,28 @@
 		}
 
 		[Test]
-		public void HexEscape () 
+		public void HexEscape ()
 		{
-			Assert.AreEqual ("%20", Uri.HexEscape (' '), "#1"); 
-			Assert.AreEqual ("%A9", Uri.HexEscape ((char) 0xa9), "#2"); 
-			Assert.AreEqual ("%41", Uri.HexEscape ('A'), "#3"); 
+			Assert.AreEqual ("%20", Uri.HexEscape (' '), "#1");
+			Assert.AreEqual ("%A9", Uri.HexEscape ((char) 0xa9), "#2");
+			Assert.AreEqual ("%41", Uri.HexEscape ('A'), "#3");
 			try {
 				Uri.HexEscape ((char) 0x0369);
 				Assert.Fail ("#4");
 			} catch (ArgumentOutOfRangeException) {}
 		}
 
-        [Test]
-        public void MoreHexEscape()
-        {
-            string url = "http://guyc-2003-sp/wiki/wiki%20document%20library/??%20???.docx";
-            string escapedAbsolutePath = "/wiki/wiki%20document%20library/%D7%91%D7%93%20%D7%99%D7%A7%D7%94.docx";
-            Uri u = new Uri(url);
-            Assert.AreEqual (escapedAbsolutePath, u.AbsolutePath, "Escaped non-english combo");
-        }
+	[Test]
+	public void MoreHexEscape()
+	{
+	    string url = "http://guyc-2003-sp/wiki/wiki%20document%20library/??%20???.docx";
+	    string escapedAbsolutePath = "/wiki/wiki%20document%20library/%D7%91%D7%93%20%D7%99%D7%A7%D7%94.docx";
+	    Uri u = new Uri(url);
+	    Assert.AreEqual (escapedAbsolutePath, u.AbsolutePath, "Escaped non-english combo");
+	}
 
 		[Test]
-		public void HexUnescape () 
+		public void HexUnescape ()
 		{
 			int i = 0;
 			Assert.AreEqual (' ', Uri.HexUnescape ("%20", ref i), "#1");
@@ -853,7 +853,7 @@
 		[Category ("NotDotNet")]
 #endif
 		[Test]
-		public void HexUnescapeMultiByte () 
+		public void HexUnescapeMultiByte ()
 		{
 			// Tests from bug 74872
 			// Note: These won't pass exactly with MS.NET, due to differences in the
@@ -874,19 +874,19 @@
 			Assert.AreEqual (0xDB40, path [6], "#4");
 			Assert.AreEqual (0xDD00, path [7], "#5");
 			Assert.AreEqual (0x62, path [8], "#6");
-			
+
 			// 2-byte escape sequence, 2 individual characters
 			uri = new Uri ("file:///foo/a%C2%F8b", true);
 			path = uri.LocalPath;
 			Assert.AreEqual (9, path.Length, "#7");
 			Assert.AreEqual (0xC2, path [6], "#8");
-			Assert.AreEqual (0xF8, path [7], "#9");			
+			Assert.AreEqual (0xF8, path [7], "#9");
 		}
 
 		[Test]
-		public void IsHexDigit () 
+		public void IsHexDigit ()
 		{
-			Assert.IsTrue (Uri.IsHexDigit ('a'), "#1");	
+			Assert.IsTrue (Uri.IsHexDigit ('a'), "#1");
 			Assert.IsTrue (Uri.IsHexDigit ('f'), "#2");
 			Assert.IsTrue (!Uri.IsHexDigit ('g'), "#3");
 			Assert.IsTrue (Uri.IsHexDigit ('0'), "#4");
@@ -897,14 +897,14 @@
 		}
 
 		[Test]
-		public void IsHexEncoding () 
+		public void IsHexEncoding ()
 		{
 			Assert.IsTrue (Uri.IsHexEncoding ("test%a9test", 4), "#1");
 			Assert.IsTrue (!Uri.IsHexEncoding ("test%a9test", 3), "#2");
 			Assert.IsTrue (Uri.IsHexEncoding ("test%a9", 4), "#3");
 			Assert.IsTrue (!Uri.IsHexEncoding ("test%a", 4), "#4");
 		}
-		
+
 		[Test]
 		public void GetLeftPart ()
 		{
@@ -912,7 +912,7 @@
 			Assert.AreEqual ("http://", uri.GetLeftPart (UriPartial.Scheme), "#1");
 			Assert.AreEqual ("http://www.contoso.com", uri.GetLeftPart (UriPartial.Authority), "#2");
 			Assert.AreEqual ("http://www.contoso.com/index.htm", uri.GetLeftPart (UriPartial.Path), "#3");
-			
+
 			uri = new Uri ("mailto:user at contoso.com?subject=uri");
 			Assert.AreEqual ("mailto:", uri.GetLeftPart (UriPartial.Scheme), "#4");
 			Assert.AreEqual ("", uri.GetLeftPart (UriPartial.Authority), "#5");
@@ -921,23 +921,23 @@
 			uri = new Uri ("nntp://news.contoso.com/123456 at contoso.com");
 			Assert.AreEqual ("nntp://", uri.GetLeftPart (UriPartial.Scheme), "#7");
 			Assert.AreEqual ("nntp://news.contoso.com", uri.GetLeftPart (UriPartial.Authority), "#8");
-			Assert.AreEqual ("nntp://news.contoso.com/123456 at contoso.com", uri.GetLeftPart (UriPartial.Path), "#9");			
-			
+			Assert.AreEqual ("nntp://news.contoso.com/123456 at contoso.com", uri.GetLeftPart (UriPartial.Path), "#9");
+
 			uri = new Uri ("news:123456 at contoso.com");
 			Assert.AreEqual ("news:", uri.GetLeftPart (UriPartial.Scheme), "#10");
 			Assert.AreEqual ("", uri.GetLeftPart (UriPartial.Authority), "#11");
-			Assert.AreEqual ("news:123456 at contoso.com", uri.GetLeftPart (UriPartial.Path), "#12");			
+			Assert.AreEqual ("news:123456 at contoso.com", uri.GetLeftPart (UriPartial.Path), "#12");
 
 			uri = new Uri ("file://server/filename.ext");
 			Assert.AreEqual ("file://", uri.GetLeftPart (UriPartial.Scheme), "#13");
 			Assert.AreEqual ("file://server", uri.GetLeftPart (UriPartial.Authority), "#14");
-			Assert.AreEqual ("file://server/filename.ext", uri.GetLeftPart (UriPartial.Path), "#15");			
+			Assert.AreEqual ("file://server/filename.ext", uri.GetLeftPart (UriPartial.Path), "#15");
 
 			uri = new Uri (@"\\server\share\filename.ext");
 			Assert.AreEqual ("file://", uri.GetLeftPart (UriPartial.Scheme), "#20");
 			Assert.AreEqual ("file://server", uri.GetLeftPart (UriPartial.Authority), "#21");
 			Assert.AreEqual ("file://server/share/filename.ext", uri.GetLeftPart (UriPartial.Path), "#22");
-			
+
 			uri = new Uri ("http://www.contoso.com:8080/index.htm#main");
 			Assert.AreEqual ("http://", uri.GetLeftPart (UriPartial.Scheme), "#23");
 			Assert.AreEqual ("http://www.contoso.com:8080", uri.GetLeftPart (UriPartial.Authority), "#24");
@@ -965,7 +965,7 @@
 			Uri b = new Uri ("http://www.gnome.org");
 			Uri n = new Uri (b, "blah#main#start");
 			Assert.AreEqual (n.Fragment, "#main%23start", "#3");
-			
+
 			n = new Uri (b, "blah#main#start", true);
 			Assert.AreEqual (n.Fragment, "#main#start", "#4");
 		}
@@ -1019,10 +1019,10 @@
 			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.contoso.com"), "#9");
 			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName (".www.contoso.com"), "#10");
 			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.contoso.com."), "#11");
-			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.con-toso.com"), "#12");	
-			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.con_toso.com"), "#13");	
-			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("www.con,toso.com"), "#14");	
-			
+			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.con-toso.com"), "#12");
+			Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("www.con_toso.com"), "#13");
+			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("www.con,toso.com"), "#14");
+
 			// test IPv6
 			Assert.AreEqual (UriHostNameType.IPv6, Uri.CheckHostName ("11:22:33:44:55:66:77:88"), "#15");
 			Assert.AreEqual (UriHostNameType.IPv6, Uri.CheckHostName ("11::33:44:55:66:77:88"), "#16");
@@ -1059,7 +1059,7 @@
 			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("*.go-mono.com"), "#46");
 			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("www*.go-mono.com"), "#47");
 		}
-		
+
 		[Test]
 		public void IsLoopback ()
 		{
@@ -1191,7 +1191,7 @@
 		}
 
 		[Test]
-		public void GetHashCodeTest () 
+		public void GetHashCodeTest ()
 		{
 			Uri uri1 = new Uri ("http://www.contoso.com/index.htm#main");
 			Uri uri2 = new Uri ("http://www.contoso.com/index.htm#fragment");
@@ -1247,7 +1247,7 @@
 			Uri u = new Uri ("foo", UriKind.Relative);
 			u.GetLeftPart (UriPartial.Path);
 		}
-		
+
 		[Test]
 		public void TestPartialToString ()
 		{
@@ -1257,7 +1257,7 @@
 			Assert.AreEqual (new Uri ("foo#dingus?aa", UriKind.Relative).ToString (), "foo#dingus?aa", "#4");
 			Assert.AreEqual (new Uri ("foo?dingus#aa", UriKind.Relative).ToString (), "foo?dingus#aa", "#4");
 		}
-		
+
 		[Test]
 		public void RelativeGetHashCodeTest()
 		{
@@ -1283,30 +1283,30 @@
 
 			Assert.AreEqual ("foo/bar/index.htm", uri1.MakeRelative (uri2), "#1");
 			Assert.AreEqual ("../../index.htm", uri2.MakeRelative (uri1), "#2");
-			
+
 			Assert.AreEqual ("../../bar/foo/index.htm", uri2.MakeRelative (uri3), "#3");
 			Assert.AreEqual ("../../foo/bar/index.htm", uri3.MakeRelative (uri2), "#4");
 
 			Assert.AreEqual ("../foo2/index.htm", uri3.MakeRelative (uri4), "#5");
 			Assert.AreEqual ("../foo/index.htm", uri4.MakeRelative (uri3), "#6");
-			
+
 			Assert.AreEqual ("https://www.contoso.com/bar/foo/index.htm?y=1", uri4.MakeRelative (uri5), "#7");
 
 			Assert.AreEqual ("http://www.contoso2.com/bar/foo/index.htm?x=0", uri4.MakeRelative (uri6), "#8");
 
 			Assert.AreEqual ("", uri6.MakeRelative (uri6), "#9");
 			Assert.AreEqual ("foobar.htm", uri6.MakeRelative (uri7), "#10");
-			
+
 			Uri uri10 = new Uri ("mailto:xxx at xxx.com");
 			Uri uri11 = new Uri ("mailto:xxx at xxx.com?subject=hola");
 			Assert.AreEqual ("", uri10.MakeRelative (uri11), "#11");
-			
+
 			Uri uri12 = new Uri ("mailto:xxx at mail.xxx.com?subject=hola");
 			Assert.AreEqual ("mailto:xxx at mail.xxx.com?subject=hola", uri10.MakeRelative (uri12), "#12");
-						
+
 			Uri uri13 = new Uri ("mailto:xxx at xxx.com/foo/bar");
 			Assert.AreEqual ("/foo/bar", uri10.MakeRelative (uri13), "#13");
-			
+
 			Assert.AreEqual ("http://www.xxx.com/bar/foo/foobar.htm?z=0&y=5" + (char) 0xa9, uri1.MakeRelative (uri8), "#14");
 		}
 
@@ -1616,10 +1616,10 @@
 		public void TestEscapeDataString ()
 		{
 			StringBuilder sb = new StringBuilder ();
-			
+
 			for (int i = 0; i < 128; i++)
 				sb.Append ((char) i);
-			
+
 			Assert.AreEqual ("%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22%23%24%25%26'()*%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
 				      Uri.EscapeDataString (sb.ToString ()));
 
@@ -1631,7 +1631,7 @@
 			StringBuilder sb = new StringBuilder ();
 			for (int i = 0; i < 128; i++)
 				sb.Append ((char) i);
-			
+
 			Assert.AreEqual ("%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22#$%25&'()*+,-./0123456789:;%3C=%3E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~%7F",
 				Uri.EscapeUriString (sb.ToString ()));
 			Assert.AreEqual ("%C3%A1", Uri.EscapeDataString ("?"));
@@ -1651,7 +1651,7 @@
 		}
 
 		// This test doesn't work on Linux, and arguably shouldn't work.
-		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar" 
+		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar"
 		// on Linux, as anyone sane would expect.  It *doesn't* under .NET 1.1
 		// Apparently "tmp" is supposed to be a hostname (!)...
 		// Since "correct" behavior would confuse all Linux developers, and having
@@ -1684,7 +1684,7 @@
 
 		public static void Print (Uri uri)
 		{
-			Console.WriteLine ("ToString: " + uri.ToString ());	
+			Console.WriteLine ("ToString: " + uri.ToString ());
 
 			Console.WriteLine ("AbsolutePath: " + uri.AbsolutePath);
 			Console.WriteLine ("AbsoluteUri: " + uri.AbsoluteUri);
@@ -1706,12 +1706,126 @@
 
 			Console.WriteLine ("Segments:");
 			string [] segments = uri.Segments;
-			if (segments == null) 
+			if (segments == null)
 				Console.WriteLine ("\tNo Segments");
-			else 
-				for (int i = 0; i < segments.Length; i++) 
+			else
+				for (int i = 0; i < segments.Length; i++)
 					Console.WriteLine ("\t" + segments[i]);
 			Console.WriteLine ("");
 		}
+
+//BNC#533572
+#if NET_2_0
+		[Test]
+		public void LocalPath_FileNameWithAtSign1 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			Assert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			Assert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			Assert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			Assert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			Assert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			Assert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			Assert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			Assert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			Assert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign2 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://user:password at thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			Assert.AreEqual (fileUri.UserInfo, "user:password", "LocalPath_FileNameWithAtSign UserInfo");
+			Assert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			Assert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			Assert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			Assert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			Assert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			Assert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			Assert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			Assert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign3 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			Assert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			Assert.AreEqual (fileUri.Host, String.Empty, "LocalPath_FileNameWithAtSign Host");
+			Assert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			Assert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			Assert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			Assert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			Assert.AreEqual (path, new DerivedUri (fullpath).TestUnescape(path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			Assert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			Assert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign4 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			Assert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			Assert.AreEqual (fileUri.Host, "localhost", "LocalPath_FileNameWithAtSign Host");
+			Assert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			Assert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			Assert.IsTrue (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			Assert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			Assert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			Assert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			//this test is marked as NotWorking below:
+			//Assert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void LocalPath_FileNameWithAtSign5 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			Assert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")] // MS.NET seems not to like userinfo in a file:// uri...
+		[ExpectedException (typeof (UriFormatException))]
+		public void LocalPath_FileNameWithAtSign6 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://user:password at localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+		}
+
+
+		public class DerivedUri : Uri
+		{
+			public DerivedUri (string uriString) : base (uriString)
+			{
+			}
+
+			internal string TestUnescape (string path)
+			{
+				return base.Unescape (path);
+			}
+		}
+#endif
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:01:43 2009
From: mono-patches-list at lists.ximian.com (Calen Chen (cachen@novell.com))
Date: Tue,  1 Sep 2009 06:01:43 -0400 (EDT)
Subject: [Mono-patches] r141021 - in trunk/uia2atk/test/samples/moonlight: .
	mediaelement mediaelement/MediaElementSample
	mediaelement/MediaElementSample/MediaElementSample
	mediaelement/MediaElementSample/MediaElementSample/Bin
	mediaelement/MediaElementSample/MediaElementSample/Properties
	mediaelement/MediaElementSample/MediaElementSample/obj
	mediaelement/MediaElementSample/MediaElementSample/obj/Debug
	mediaelement/MediaElementSample/MediaElementSample.Web
	mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin
	mediaelement/MediaElementSample/MediaElementSample.Web/Properties
	mediaelement/MediaElementSample/MediaElementSample.Web/obj
	mediaelement/MediaElementSample/MediaElementSample.Web/obj/Debug
Message-ID: <20090901100143.07F789472C@mono-cvs.ximian.com>

Author: cachen
Date: 2009-09-01 06:01:42 -0400 (Tue, 01 Sep 2009)
New Revision: 141021

Added:
   trunk/uia2atk/test/samples/moonlight/mediaelement/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.xap
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/App_Data/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/MediaElementSample.xap
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/media.wmv
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.designer.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj.user
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.aspx
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.html
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Properties/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Properties/AssemblyInfo.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Silverlight.js
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Web.config
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/bin/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/obj/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/obj/Debug/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/obj/Debug/TempPE/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.sln
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.suo
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Bin/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Bin/Debug/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj.user
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AppManifest.xml
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AssemblyInfo.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/App.g.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/Page.g.cs
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/TempPE/
Log:
add SL2 MediaElement sample

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,8 @@
+?<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             x:Class="MediaElementSample.App"
+             >
+    <Application.Resources>
+        
+    </Application.Resources>
+</Application>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/App.xaml.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,66 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace MediaElementSample
+{
+    public partial class App : Application
+    {
+
+        public App()
+        {
+            this.Startup += this.Application_Startup;
+            this.Exit += this.Application_Exit;
+            this.UnhandledException += this.Application_UnhandledException;
+
+            InitializeComponent();
+        }
+
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            this.RootVisual = new Page();
+        }
+
+        private void Application_Exit(object sender, EventArgs e)
+        {
+
+        }
+        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+        {
+            // If the app is running outside of the debugger then report the exception using
+            // the browser's exception mechanism. On IE this will display it a yellow alert 
+            // icon in the status bar and Firefox will display a script error.
+            if (!System.Diagnostics.Debugger.IsAttached)
+            {
+
+                // NOTE: This will allow the application to continue running after an exception has been thrown
+                // but not handled. 
+                // For production applications this error handling should be replaced with something that will 
+                // report the error to the website and stop the application.
+                e.Handled = true;
+                Deployment.Current.Dispatcher.BeginInvoke(delegate { ReportErrorToDOM(e); });
+            }
+        }
+        private void ReportErrorToDOM(ApplicationUnhandledExceptionEventArgs e)
+        {
+            try
+            {
+                string errorMsg = e.ExceptionObject.Message + e.ExceptionObject.StackTrace;
+                errorMsg = errorMsg.Replace('"', '\'').Replace("\r\n", @"\n");
+
+                System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(\"Unhandled Error in Silverlight 2 Application " + errorMsg + "\");");
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,94 @@
+?<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MediaElementSample</RootNamespace>
+    <AssemblyName>MediaElementSample</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>MediaElementSample.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>MediaElementSample.App</SilverlightAppEntry>
+    <TestPageFileName>TestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows" />
+    <Reference Include="mscorlib" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Page.xaml.cs">
+      <DependentUpon>Page.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Page.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj.user
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj.user	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/MediaElementSample.csproj.user	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,25 @@
+?<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}" xmlns="">
+        <SilverlightProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>DynamicPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <ShowWebRefOnDebugPrompt>True</ShowWebRefOnDebugPrompt>
+        </SilverlightProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,31 @@
+?<UserControl x:Class="MediaElementSample.Page"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    Width="450" Height="400">
+    <Grid x:Name="LayoutRoot" Background="White">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="30" />
+        </Grid.RowDefinitions>
+        <!-- Label -->
+        <Grid Grid.Row="0" HorizontalAlignment="Left" Margin="10,10,0,0">
+            <TextBlock x:Name="label1" Text="WMV media:" />
+        </Grid>
+
+        <!-- Media element -->
+        <Grid Grid.Row="1" Background="Black" Margin="10,10,0,0">
+            <MediaElement x:Name="VideoElement" Source="media.wmv" />
+        </Grid>
+
+        <!-- Video controls -->
+        <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Center">
+            <ToggleButton x:Name="btnPlayPause" Content="Pause" Width="75" Height="25" />
+
+            <Slider x:Name="sliderScrubber" Width="250" Minimum="0" Maximum="1" Margin="5,0,0,0" />
+
+            <TextBlock x:Name="txtVideoPosition" Margin="5,0,0,0" />
+
+        </StackPanel>
+    </Grid>
+</UserControl>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Page.xaml.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,68 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace MediaElementSample
+{
+    public partial class Page : UserControl
+    {
+        private DispatcherTimer timer;
+        public Page()
+        {
+            InitializeComponent();
+            btnPlayPause.Checked += new RoutedEventHandler(btnPlayPause_Checked);
+            btnPlayPause.Unchecked += new RoutedEventHandler(btnPlayPause_Unchecked);
+
+            VideoElement.CurrentStateChanged += new RoutedEventHandler(VideoElement_CurrentStateChanged);
+
+            timer = new DispatcherTimer();
+            timer.Interval = TimeSpan.FromMilliseconds(50);
+            timer.Tick += new EventHandler(timer_Tick);
+        }
+        void timer_Tick(object sender, EventArgs e)
+        {
+            if (VideoElement.NaturalDuration.TimeSpan.TotalSeconds > 0)
+            {
+                txtVideoPosition.Text =
+                    string.Format("{0:00}:{1:00}", VideoElement.Position.Minutes, VideoElement.Position.Seconds);
+
+                sliderScrubber.Value = VideoElement.Position.TotalSeconds /
+                    VideoElement.NaturalDuration.TimeSpan.TotalSeconds;
+            }
+        }
+
+        void VideoElement_CurrentStateChanged(object sender, RoutedEventArgs e)
+        {
+            if (VideoElement.CurrentState == MediaElementState.Playing)
+            {
+                timer.Start();
+            }
+            else
+            {
+                timer.Stop();
+            }
+        }
+
+        void btnPlayPause_Unchecked(object sender, RoutedEventArgs e)
+        {
+            VideoElement.Play();
+            btnPlayPause.Content = "Pause";
+        }
+
+        private void btnPlayPause_Checked(object sender, RoutedEventArgs e)
+        {
+            VideoElement.Pause();
+            btnPlayPause.Content = "Play";
+        }
+    }
+}
+

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AppManifest.xml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AppManifest.xml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AppManifest.xml	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,6 @@
+?<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AssemblyInfo.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/Properties/AssemblyInfo.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,35 @@
+?using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MediaElementSample")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MediaElementSample")]
+[assembly: AssemblyCopyright("Copyright ?  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5d342766-5bd1-4488-9955-3e26ee9a58e6")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/App.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/App.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/App.g.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,52 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\MediaElementSample\MediaElementSample\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "51E39E598B8C7EF17F2112EFDE6F99EE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace MediaElementSample {
+    
+    
+    public partial class App : System.Windows.Application {
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/MediaElementSample;component/App.xaml", System.UriKind.Relative));
+        }
+    }
+}

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/Page.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/Page.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample/obj/Debug/Page.g.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,70 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\MediaElementSample\MediaElementSample\Page.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4DB2E806901A7429902789DE1F221085"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace MediaElementSample {
+    
+    
+    public partial class Page : System.Windows.Controls.UserControl {
+        
+        internal System.Windows.Controls.Grid LayoutRoot;
+        
+        internal System.Windows.Controls.TextBlock label1;
+        
+        internal System.Windows.Controls.MediaElement VideoElement;
+        
+        internal System.Windows.Controls.Primitives.ToggleButton btnPlayPause;
+        
+        internal System.Windows.Controls.Slider sliderScrubber;
+        
+        internal System.Windows.Controls.TextBlock txtVideoPosition;
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/MediaElementSample;component/Page.xaml", System.UriKind.Relative));
+            this.LayoutRoot = ((System.Windows.Controls.Grid)(this.FindName("LayoutRoot")));
+            this.label1 = ((System.Windows.Controls.TextBlock)(this.FindName("label1")));
+            this.VideoElement = ((System.Windows.Controls.MediaElement)(this.FindName("VideoElement")));
+            this.btnPlayPause = ((System.Windows.Controls.Primitives.ToggleButton)(this.FindName("btnPlayPause")));
+            this.sliderScrubber = ((System.Windows.Controls.Slider)(this.FindName("sliderScrubber")));
+            this.txtVideoPosition = ((System.Windows.Controls.TextBlock)(this.FindName("txtVideoPosition")));
+        }
+    }
+}

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/MediaElementSample.xap
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/MediaElementSample.xap
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/media.wmv
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/ClientBin/media.wmv
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,16 @@
+?<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="MediaElementSample.Web._Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+    
+    </div>
+    </form>
+</body>
+</html>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,17 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MediaElementSample.Web
+{
+    public partial class _Default : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.designer.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.designer.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Default.aspx.designer.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,27 @@
+?//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.42
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MediaElementSample.Web
+{
+
+
+    public partial class _Default
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,107 @@
+?<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DB90974C-B83E-417F-806B-FB7430F1D2FD}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MediaElementSample.Web</RootNamespace>
+    <AssemblyName>MediaElementSample.Web</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SilverlightApplicationList>{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}|..\MediaElementSample\MediaElementSample.csproj|ClientBin|False</SilverlightApplicationList>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Extensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Mobile" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ClientBin\media.wmv" />
+    <Content Include="ClientBin\MediaElementSample.xap" />
+    <Content Include="Default.aspx" />
+    <Content Include="MediaElementSampleTestPage.aspx" />
+    <Content Include="MediaElementSampleTestPage.html" />
+    <Content Include="Silverlight.js" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Default.aspx.designer.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>49182</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj.user
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj.user	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSample.Web.csproj.user	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,35 @@
+?<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <StartPageUrl>MediaElementSampleTestPage.aspx</StartPageUrl>
+          <StartAction>SpecificPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>True</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <PublishCopyOption>RunFiles</PublishCopyOption>
+          <PublishTargetLocation>
+          </PublishTargetLocation>
+          <PublishDeleteAllFiles>False</PublishDeleteAllFiles>
+          <PublishCopyAppData>True</PublishCopyAppData>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>False</EnableENC>
+          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <EnableWcfTestClientForSVC>False</EnableWcfTestClientForSVC>
+          <ProjectOutputReferences>
+            <Ref Project="{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}" Folder="ClientBin">MediaElementSample.xap</Ref>
+          </ProjectOutputReferences>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.aspx
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.aspx	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.aspx	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,20 @@
+?<%@ Page Language="C#" AutoEventWireup="true" %>
+
+<%@ Register Assembly="System.Web.Silverlight" Namespace="System.Web.UI.SilverlightControls"
+    TagPrefix="asp" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" style="height:100%;">
+<head runat="server">
+    <title>MediaElementSample</title>
+</head>
+<body style="height:100%;margin:0;">
+    <form id="form1" runat="server" style="height:100%;">
+        <asp:ScriptManager ID="ScriptManager1" runat="server"></asp:ScriptManager>
+        <div  style="height:100%;">
+            <asp:Silverlight ID="Xaml1" runat="server" Source="~/ClientBin/MediaElementSample.xap" MinimumVersion="2.0.31005.0" Width="100%" Height="100%" />
+        </div>
+    </form>
+</body>
+</html>
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.html
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.html	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/MediaElementSampleTestPage.html	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,77 @@
+?<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<!-- saved from url=(0014)about:internet -->
+<head>
+    <title>MediaElementSample</title>
+
+    <style type="text/css">
+    html, body {
+	    height: 100%;
+	    overflow: auto;
+    }
+    body {
+	    padding: 0;
+	    margin: 0;
+    }
+    #silverlightControlHost {
+	    height: 100%;
+    }
+    </style>
+    <script type="text/javascript" src="Silverlight.js"></script>
+    <script type="text/javascript">
+        function onSilverlightError(sender, args) {
+        
+            var appSource = "";
+            if (sender != null && sender != 0) {
+                appSource = sender.getHost().Source;
+            } 
+            var errorType = args.ErrorType;
+            var iErrorCode = args.ErrorCode;
+            
+            var errMsg = "Unhandled Error in Silverlight 2 Application " +  appSource + "\n" ;
+
+            errMsg += "Code: "+ iErrorCode + "    \n";
+            errMsg += "Category: " + errorType + "       \n";
+            errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+            if (errorType == "ParserError")
+            {
+                errMsg += "File: " + args.xamlFile + "     \n";
+                errMsg += "Line: " + args.lineNumber + "     \n";
+                errMsg += "Position: " + args.charPosition + "     \n";
+            }
+            else if (errorType == "RuntimeError")
+            {           
+                if (args.lineNumber != 0)
+                {
+                    errMsg += "Line: " + args.lineNumber + "     \n";
+                    errMsg += "Position: " +  args.charPosition + "     \n";
+                }
+                errMsg += "MethodName: " + args.methodName + "     \n";
+            }
+
+            throw new Error(errMsg);
+        }
+    </script>
+</head>
+
+<body>
+    <!-- Runtime errors from Silverlight will be displayed here.
+	This will contain debugging information and should be removed or hidden when debugging is completed -->
+	<div id='errorLocation' style="font-size: small;color: Gray;"></div>
+
+    <div id="silverlightControlHost">
+		<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" width="100%" height="100%">
+			<param name="source" value="ClientBin/MediaElementSample.xap"/>
+			<param name="onerror" value="onSilverlightError" />
+			<param name="background" value="white" />
+			<param name="minRuntimeVersion" value="2.0.31005.0" />
+			<param name="autoUpgrade" value="true" />
+			<a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
+     			<img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none"/>
+			</a>
+		</object>
+		<iframe style='visibility:hidden;height:0;width:0;border:0px'></iframe>
+    </div>
+</body>
+</html>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Properties/AssemblyInfo.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Properties/AssemblyInfo.cs	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,35 @@
+?using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MediaElementSample.Web")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MediaElementSample.Web")]
+[assembly: AssemblyCopyright("Copyright ?  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3d5900ae-111a-45be-96b3-d9e4606ca793")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Silverlight.js
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Silverlight.js	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Silverlight.js	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,486 @@
+?if (!window.Silverlight)
+{
+    window.Silverlight = { };
+}
+
+// Silverlight control instance counter for memory mgt
+Silverlight._silverlightCount = 0;
+Silverlight.fwlinkRoot='http://go2.microsoft.com/fwlink/?LinkID=';  
+Silverlight.onGetSilverlight = null;
+Silverlight.onSilverlightInstalled = function () {window.location.reload(false);};
+
+//////////////////////////////////////////////////////////////////
+// isInstalled, checks to see if the correct version is installed
+//////////////////////////////////////////////////////////////////
+Silverlight.isInstalled = function(version)
+{
+    var isVersionSupported=false;
+    var container = null;
+    
+    try 
+    {
+        var control = null;
+        
+        try
+        {
+            control = new ActiveXObject('AgControl.AgControl');
+            if ( version == null )
+            {
+                isVersionSupported = true;
+            }
+            else if ( control.IsVersionSupported(version) )
+            {
+                isVersionSupported = true;
+            }
+            control = null;
+        }
+        catch (e)
+        {
+            var plugin = navigator.plugins["Silverlight Plug-In"] ;
+            if ( plugin )
+            {
+                if ( version === null )
+                {
+                    isVersionSupported = true;
+                }
+                else
+                {
+                    var actualVer = plugin.description;
+                    if ( actualVer === "1.0.30226.2")
+                        actualVer = "2.0.30226.2";
+                    var actualVerArray =actualVer.split(".");
+                    while ( actualVerArray.length > 3)
+                    {
+                        actualVerArray.pop();
+                    }
+                    while ( actualVerArray.length < 4)
+                    {
+                        actualVerArray.push(0);
+                    }
+                    var reqVerArray = version.split(".");
+                    while ( reqVerArray.length > 4)
+                    {
+                        reqVerArray.pop();
+                    }
+                    
+                    var requiredVersionPart ;
+                    var actualVersionPart
+                    var index = 0;
+                    
+                    
+                    do
+                    {
+                        requiredVersionPart = parseInt(reqVerArray[index]);
+                        actualVersionPart = parseInt(actualVerArray[index]);
+                        index++;
+                    }
+                    while (index < reqVerArray.length && requiredVersionPart === actualVersionPart);
+                    
+                    if ( requiredVersionPart <= actualVersionPart && !isNaN(requiredVersionPart) )
+                    {
+                        isVersionSupported = true;
+                    }
+                }
+            }
+        }
+    }
+    catch (e) 
+    {
+        isVersionSupported = false;
+    }
+    if (container) 
+    {
+        document.body.removeChild(container);
+    }
+    
+    return isVersionSupported;
+}
+Silverlight.WaitForInstallCompletion = function()
+{
+    if ( ! Silverlight.isBrowserRestartRequired && Silverlight.onSilverlightInstalled )
+    {
+        try
+        {
+            navigator.plugins.refresh();
+        }
+        catch(e)
+        {
+        }
+        if ( Silverlight.isInstalled(null) )
+        {
+            Silverlight.onSilverlightInstalled();
+        }
+        else
+        {
+              setTimeout(Silverlight.WaitForInstallCompletion, 3000);
+        }    
+    }
+}
+Silverlight.__startup = function()
+{
+    Silverlight.isBrowserRestartRequired = Silverlight.isInstalled(null);//(!window.ActiveXObject || Silverlight.isInstalled(null));
+    if ( !Silverlight.isBrowserRestartRequired)
+    {
+        Silverlight.WaitForInstallCompletion();
+    }
+    if (window.removeEventListener) { 
+       window.removeEventListener('load', Silverlight.__startup , false);
+    }
+    else { 
+        window.detachEvent('onload', Silverlight.__startup );
+    }
+}
+
+if (window.addEventListener) 
+{
+    window.addEventListener('load', Silverlight.__startup , false);
+}
+else 
+{
+    window.attachEvent('onload', Silverlight.__startup );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// createObject();  Params:
+// parentElement of type Element, the parent element of the Silverlight Control
+// source of type String
+// id of type string
+// properties of type String, object literal notation { name:value, name:value, name:value},
+//     current properties are: width, height, background, framerate, isWindowless, enableHtmlAccess, inplaceInstallPrompt:  all are of type string
+// events of type String, object literal notation { name:value, name:value, name:value},
+//     current events are onLoad onError, both are type string
+// initParams of type Object or object literal notation { name:value, name:value, name:value}
+// userContext of type Object
+/////////////////////////////////////////////////////////////////////////////////
+
+Silverlight.createObject = function(source, parentElement, id, properties, events, initParams, userContext)
+{
+    var slPluginHelper = new Object();
+    var slProperties = properties;
+    var slEvents = events;
+    
+    slPluginHelper.version = slProperties.version;
+    slProperties.source = source;    
+    slPluginHelper.alt = slProperties.alt;
+    
+    //rename properties to their tag property names
+    if ( initParams )
+        slProperties.initParams = initParams;
+    if ( slProperties.isWindowless && !slProperties.windowless)
+        slProperties.windowless = slProperties.isWindowless;
+    if ( slProperties.framerate && !slProperties.maxFramerate)
+        slProperties.maxFramerate = slProperties.framerate;
+    if ( id && !slProperties.id)
+        slProperties.id = id;
+    
+    // remove elements which are not to be added to the instantiation tag
+    delete slProperties.ignoreBrowserVer;
+    delete slProperties.inplaceInstallPrompt;
+    delete slProperties.version;
+    delete slProperties.isWindowless;
+    delete slProperties.framerate;
+    delete slProperties.data;
+    delete slProperties.src;
+    delete slProperties.alt;
+
+
+    // detect that the correct version of Silverlight is installed, else display install
+
+    if (Silverlight.isInstalled(slPluginHelper.version))
+    {
+        //move unknown events to the slProperties array
+        for (var name in slEvents)
+        {
+            if ( slEvents[name])
+            {
+                if ( name == "onLoad" && typeof slEvents[name] == "function" && slEvents[name].length != 1 )
+                {
+                    var onLoadHandler = slEvents[name];
+                    slEvents[name]=function (sender){ return onLoadHandler(document.getElementById(id), userContext, sender)};
+                }
+                var handlerName = Silverlight.__getHandlerName(slEvents[name]);
+                if ( handlerName != null )
+                {
+                    slProperties[name] = handlerName;
+                    slEvents[name] = null;
+                }
+                else
+                {
+                    throw "typeof events."+name+" must be 'function' or 'string'";
+                }
+            }
+        }
+        slPluginHTML = Silverlight.buildHTML(slProperties);
+    }
+    //The control could not be instantiated. Show the installation prompt
+    else 
+    {
+        slPluginHTML = Silverlight.buildPromptHTML(slPluginHelper);
+    }
+
+    // insert or return the HTML
+    if(parentElement)
+    {
+        parentElement.innerHTML = slPluginHTML;
+    }
+    else
+    {
+        return slPluginHTML;
+    }
+
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  create HTML that instantiates the control
+//
+///////////////////////////////////////////////////////////////////////////////
+Silverlight.buildHTML = function( slProperties)
+{
+    var htmlBuilder = [];
+
+    htmlBuilder.push('<object type=\"application/x-silverlight\" data="data:application/x-silverlight,"');
+    if ( slProperties.id != null )
+    {
+        htmlBuilder.push(' id="' + slProperties.id + '"');
+    }
+    if ( slProperties.width != null )
+    {
+        htmlBuilder.push(' width="' + slProperties.width+ '"');
+    }
+    if ( slProperties.height != null )
+    {
+        htmlBuilder.push(' height="' + slProperties.height + '"');
+    }
+    htmlBuilder.push(' >');
+    
+    delete slProperties.id;
+    delete slProperties.width;
+    delete slProperties.height;
+    
+    for (var name in slProperties)
+    {
+        if (slProperties[name])
+        {
+            htmlBuilder.push('<param name="'+Silverlight.HtmlAttributeEncode(name)+'" value="'+Silverlight.HtmlAttributeEncode(slProperties[name])+'" />');
+        }
+    }
+    htmlBuilder.push('<\/object>');
+    return htmlBuilder.join('');
+}
+
+
+
+
+// createObjectEx, takes a single parameter of all createObject parameters enclosed in {}
+Silverlight.createObjectEx = function(params)
+{
+    var parameters = params;
+    var html = Silverlight.createObject(parameters.source, parameters.parentElement, parameters.id, parameters.properties, parameters.events, parameters.initParams, parameters.context);
+    if (parameters.parentElement == null)
+    {
+        return html;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Builds the HTML to prompt the user to download and install Silverlight
+///////////////////////////////////////////////////////////////////////////////////////////////
+Silverlight.buildPromptHTML = function(slPluginHelper)
+{
+    var slPluginHTML = "";
+    var urlRoot = Silverlight.fwlinkRoot;
+    var shortVer = slPluginHelper.version ;
+    if ( slPluginHelper.alt )
+    {
+        slPluginHTML = slPluginHelper.alt;
+    }
+    else
+    {
+        if (! shortVer )
+        {
+            shortVer="";
+        }
+        slPluginHTML = "<a href='javascript:Silverlight.getSilverlight(\"{1}\");' style='text-decoration: none;'><img src='{2}' alt='Get Microsoft Silverlight' style='border-style: none'/></a>";
+        slPluginHTML = slPluginHTML.replace('{1}', shortVer );
+        slPluginHTML = slPluginHTML.replace('{2}', urlRoot + '108181');
+    }
+    
+    return slPluginHTML;
+}
+
+
+Silverlight.getSilverlight = function(version)
+{
+    if (Silverlight.onGetSilverlight )
+    {
+        Silverlight.onGetSilverlight();
+    }
+    
+    var shortVer = "";
+    var reqVerArray = String(version).split(".");
+    if (reqVerArray.length > 1)
+    {
+        var majorNum = parseInt(reqVerArray[0] );
+        if ( isNaN(majorNum) || majorNum < 2 )
+        {
+            shortVer = "1.0";
+        }
+        else
+        {
+            shortVer = reqVerArray[0]+'.'+reqVerArray[1];
+        }
+    }
+    
+    var verArg = "";
+    
+    if (shortVer.match(/^\d+\056\d+$/) )
+    {
+        verArg = "&v="+shortVer;
+    }
+    
+    Silverlight.followFWLink("114576" + verArg);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+/// Navigates to a url based on fwlinkid
+///////////////////////////////////////////////////////////////////////////////////////////////
+Silverlight.followFWLink = function(linkid)
+{
+    top.location=Silverlight.fwlinkRoot+String(linkid);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+/// Encodes special characters in input strings as charcodes
+///////////////////////////////////////////////////////////////////////////////////////////////
+Silverlight.HtmlAttributeEncode = function( strInput )
+{
+      var c;
+      var retVal = '';
+
+    if(strInput == null)
+      {
+          return null;
+    }
+      
+      for(var cnt = 0; cnt < strInput.length; cnt++)
+      {
+            c = strInput.charCodeAt(cnt);
+
+            if (( ( c > 96 ) && ( c < 123 ) ) ||
+                  ( ( c > 64 ) && ( c < 91 ) ) ||
+                  ( ( c > 43 ) && ( c < 58 ) && (c!=47)) ||
+                  ( c == 95 ))
+            {
+                  retVal = retVal + String.fromCharCode(c);
+            }
+            else
+            {
+                  retVal = retVal + '&#' + c + ';';
+            }
+      }
+      
+      return retVal;
+}
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Default error handling function to be used when a custom error handler is
+//  not present
+//
+///////////////////////////////////////////////////////////////////////////////
+
+Silverlight.default_error_handler = function (sender, args)
+{
+    var iErrorCode;
+    var errorType = args.ErrorType;
+
+    iErrorCode = args.ErrorCode;
+
+    var errMsg = "\nSilverlight error message     \n" ;
+
+    errMsg += "ErrorCode: "+ iErrorCode + "\n";
+
+
+    errMsg += "ErrorType: " + errorType + "       \n";
+    errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+    if (errorType == "ParserError")
+    {
+        errMsg += "XamlFile: " + args.xamlFile + "     \n";
+        errMsg += "Line: " + args.lineNumber + "     \n";
+        errMsg += "Position: " + args.charPosition + "     \n";
+    }
+    else if (errorType == "RuntimeError")
+    {
+        if (args.lineNumber != 0)
+        {
+            errMsg += "Line: " + args.lineNumber + "     \n";
+            errMsg += "Position: " +  args.charPosition + "     \n";
+        }
+        errMsg += "MethodName: " + args.methodName + "     \n";
+    }
+    alert (errMsg);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+/// Releases event handler resources when the page is unloaded
+///////////////////////////////////////////////////////////////////////////////////////////////
+Silverlight.__cleanup = function ()
+{
+    for (var i = Silverlight._silverlightCount - 1; i >= 0; i--) {
+        window['__slEvent' + i] = null;
+    }
+    Silverlight._silverlightCount = 0;
+    if (window.removeEventListener) { 
+       window.removeEventListener('unload', Silverlight.__cleanup , false);
+    }
+    else { 
+        window.detachEvent('onunload', Silverlight.__cleanup );
+    }
+}
+///////////////////////////////////////////////////////////////////////////////////////////////
+/// Releases event handler resources when the page is unloaded
+///////////////////////////////////////////////////////////////////////////////////////////////
+Silverlight.__getHandlerName = function (handler)
+{
+    var handlerName = "";
+    if ( typeof handler == "string")
+    {
+        handlerName = handler;
+    }
+    else if ( typeof handler == "function" )
+    {
+        if (Silverlight._silverlightCount == 0)
+        {
+            if (window.addEventListener) 
+            {
+                window.addEventListener('onunload', Silverlight.__cleanup , false);
+            }
+            else 
+            {
+                window.attachEvent('onunload', Silverlight.__cleanup );
+            }
+        }
+        var count = Silverlight._silverlightCount++;
+        handlerName = "__slEvent"+count;
+        
+        window[handlerName]=handler;
+    }
+    else
+    {
+        handlerName = null;
+    }
+    return handlerName;
+}
\ No newline at end of file

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Web.config
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Web.config	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.Web/Web.config	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,107 @@
+?<?xml version="1.0"?>
+<configuration>
+	<configSections>
+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				</sectionGroup>
+			</sectionGroup>
+		</sectionGroup>
+	</configSections>
+	<appSettings/>
+	<connectionStrings/>
+	<system.web>
+		<!-- 
+            Set compilation debug="true" to insert debugging 
+            symbols into the compiled page. Because this 
+            affects performance, set this value to true only 
+            during development.
+        -->
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+			</assemblies>
+		</compilation>
+		<!--
+            The <authentication> section enables configuration 
+            of the security authentication mode used by 
+            ASP.NET to identify an incoming user. 
+        -->
+		<authentication mode="Windows"/>
+		<!--
+            The <customErrors> section enables configuration 
+            of what to do if/when an unhandled error occurs 
+            during the execution of a request. Specifically, 
+            it enables developers to configure html error pages 
+            to be displayed in place of a error stack trace.
+
+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
+            <error statusCode="403" redirect="NoAccess.htm" />
+            <error statusCode="404" redirect="FileNotFound.htm" />
+        </customErrors>
+        -->
+		<pages>
+			<controls>
+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</controls>
+		</pages>
+		<httpHandlers>
+			<remove verb="*" path="*.asmx"/>
+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+		</httpHandlers>
+		<httpModules>
+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+		</httpModules>
+	</system.web>
+	<system.codedom>
+		<compilers>
+			<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+				<providerOption name="CompilerVersion" value="v3.5"/>
+				<providerOption name="WarnAsError" value="false"/>
+			</compiler>
+		</compilers>
+	</system.codedom>
+	<!-- 
+        The system.webServer section is required for running ASP.NET AJAX under Internet
+        Information Services 7.0.  It is not necessary for previous version of IIS.
+    -->
+	<system.webServer>
+		<validation validateIntegratedModeConfiguration="false"/>
+		<modules>
+			<remove name="ScriptModule"/>
+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+		</modules>
+		<handlers>
+			<remove name="WebServiceHandlerFactory-Integrated"/>
+			<remove name="ScriptHandlerFactory"/>
+			<remove name="ScriptHandlerFactoryAppServices"/>
+			<remove name="ScriptResource"/>
+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+		</handlers>
+	</system.webServer>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.sln
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.sln	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.sln	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,26 @@
+?
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaElementSample", "MediaElementSample\MediaElementSample.csproj", "{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaElementSample.Web", "MediaElementSample.Web\MediaElementSample.Web.csproj", "{DB90974C-B83E-417F-806B-FB7430F1D2FD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AD3D7D3-BBA4-496B-BF9C-5D3D146CB479}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB90974C-B83E-417F-806B-FB7430F1D2FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB90974C-B83E-417F-806B-FB7430F1D2FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB90974C-B83E-417F-806B-FB7430F1D2FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB90974C-B83E-417F-806B-FB7430F1D2FD}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.suo
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample/MediaElementSample.suo
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html	2009-09-01 10:01:42 UTC (rev 141021)
@@ -0,0 +1,77 @@
+?<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<!-- saved from url=(0014)about:internet -->
+<head>
+    <title>MediaElementSample</title>
+
+    <style type="text/css">
+    html, body {
+	    height: 100%;
+	    overflow: auto;
+    }
+    body {
+	    padding: 0;
+	    margin: 0;
+    }
+    #silverlightControlHost {
+	    height: 100%;
+    }
+    </style>
+    
+    <script type="text/javascript">
+        function onSilverlightError(sender, args) {
+        
+            var appSource = "";
+            if (sender != null && sender != 0) {
+                appSource = sender.getHost().Source;
+            } 
+            var errorType = args.ErrorType;
+            var iErrorCode = args.ErrorCode;
+            
+            var errMsg = "Unhandled Error in Silverlight 2 Application " +  appSource + "\n" ;
+
+            errMsg += "Code: "+ iErrorCode + "    \n";
+            errMsg += "Category: " + errorType + "       \n";
+            errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+            if (errorType == "ParserError")
+            {
+                errMsg += "File: " + args.xamlFile + "     \n";
+                errMsg += "Line: " + args.lineNumber + "     \n";
+                errMsg += "Position: " + args.charPosition + "     \n";
+            }
+            else if (errorType == "RuntimeError")
+            {           
+                if (args.lineNumber != 0)
+                {
+                    errMsg += "Line: " + args.lineNumber + "     \n";
+                    errMsg += "Position: " +  args.charPosition + "     \n";
+                }
+                errMsg += "MethodName: " + args.methodName + "     \n";
+            }
+
+            throw new Error(errMsg);
+        }
+    </script>
+</head>
+
+<body>
+    <!-- Runtime errors from Silverlight will be displayed here.
+	This will contain debugging information and should be removed or hidden when debugging is completed -->
+	<div id='errorLocation' style="font-size: small;color: Gray;"></div>
+
+    <div id="silverlightControlHost">
+		<object data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%">
+			<param name="source" value="MediaElementSample.xap"/>
+			<param name="onerror" value="onSilverlightError" />
+			<param name="background" value="white" />
+			<param name="minRuntimeVersion" value="2.0.31005.0" />
+			<param name="autoUpgrade" value="true" />
+			<a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
+     			<img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none"/>
+			</a>
+		</object>
+		<iframe style='visibility:hidden;height:0;width:0;border:0px'></iframe>
+    </div>
+</body>
+</html>

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.xap
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.xap
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:01:59 2009
From: mono-patches-list at lists.ximian.com (Calen Chen (cachen@novell.com))
Date: Tue,  1 Sep 2009 06:01:59 -0400 (EDT)
Subject: [Mono-patches] r141022 - trunk/uia2atk/test
Message-ID: <20090901100159.15DE79472C@mono-cvs.ximian.com>

Author: cachen
Date: 2009-09-01 06:01:58 -0400 (Tue, 01 Sep 2009)
New Revision: 141022

Modified:
   trunk/uia2atk/test/ChangeLog
Log:
update ChangeLog

Modified: trunk/uia2atk/test/ChangeLog
===================================================================
--- trunk/uia2atk/test/ChangeLog	2009-09-01 10:01:42 UTC (rev 141021)
+++ trunk/uia2atk/test/ChangeLog	2009-09-01 10:01:58 UTC (rev 141022)
@@ -1,5 +1,9 @@
 2009-09-01  Calen Chen <cachen at novell.com>
 
+	* samples/moonlight/mediaelement/: add SL2 MediaElement sample
+
+2009-09-01  Calen Chen <cachen at novell.com>
+
 	* samples/moonlight/image/: add SL2 Image sample
 
 2009-08-31  Calen Chen <cachen at novell.com>


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:08:37 2009
From: mono-patches-list at lists.ximian.com (Neville Gao (NGao@novell.com))
Date: Tue,  1 Sep 2009 06:08:37 -0400 (EDT)
Subject: [Mono-patches] r141023 - in trunk/uia2atk/test: . samples/moonlight
	samples/moonlight/listbox samples/moonlight/listbox/ListBoxSample
	samples/moonlight/listbox/ListBoxSample/ListBoxSample
	samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin
	samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug
	samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties
	samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj
	samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug
	samples/moonlight/passwordbox
	samples/moonlight/passwordbox/PasswordBox
	samples/moonlight/passwordbox/PasswordBox/PasswordBox
	samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin
	samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug
	samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties
	samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj
	samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug
Message-ID: <20090901100837.190EE9472C@mono-cvs.ximian.com>

Author: ngao
Date: 2009-09-01 06:08:36 -0400 (Tue, 01 Sep 2009)
New Revision: 141023

Added:
   trunk/uia2atk/test/samples/moonlight/listbox/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.html
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.xap
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.sln
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.suo
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml.cs
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/AppManifest.xaml
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.dll
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.pdb
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj.user
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml.cs
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AppManifest.xml
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AssemblyInfo.cs
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/App.g.cs
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.csproj.FileListAbsolute.txt
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.dll
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.g.resources
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.pdb
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Page.g.cs
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Refactor/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/TempPE/
   trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/XapCacheFile.xml
   trunk/uia2atk/test/samples/moonlight/passwordbox/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox.xap
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.sln
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.suo
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml.cs
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/AppManifest.xaml
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.dll
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.pdb
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml.cs
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj.user
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AppManifest.xml
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AssemblyInfo.cs
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/App.g.cs
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/Page.g.cs
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.csproj.FileListAbsolute.txt
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.dll
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.g.resources
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.pdb
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/TempPE/
   trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/XapCacheFile.xml
   trunk/uia2atk/test/samples/moonlight/passwordbox/TestPage.html
Modified:
   trunk/uia2atk/test/ChangeLog
Log:
Added SL2 samples.


Modified: trunk/uia2atk/test/ChangeLog
===================================================================
--- trunk/uia2atk/test/ChangeLog	2009-09-01 10:01:58 UTC (rev 141022)
+++ trunk/uia2atk/test/ChangeLog	2009-09-01 10:08:36 UTC (rev 141023)
@@ -1,3 +1,8 @@
+2009-09-01  Neville Gao  <nevillegao at gmail.com>
+
+	* samples/moonlight/listbox/:
+	* samples/moonlight/passwordbox/: Added SL2 samples.
+
 2009-09-01  Calen Chen <cachen at novell.com>
 
 	* samples/moonlight/mediaelement/: add SL2 MediaElement sample

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,8 @@
+?<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             x:Class="ListBoxSample.App"
+             >
+    <Application.Resources>
+        
+    </Application.Resources>
+</Application>


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,66 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace ListBoxSample
+{
+    public partial class App : Application
+    {
+
+        public App()
+        {
+            this.Startup += this.Application_Startup;
+            this.Exit += this.Application_Exit;
+            this.UnhandledException += this.Application_UnhandledException;
+
+            InitializeComponent();
+        }
+
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            this.RootVisual = new Page();
+        }
+
+        private void Application_Exit(object sender, EventArgs e)
+        {
+
+        }
+        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+        {
+            // If the app is running outside of the debugger then report the exception using
+            // the browser's exception mechanism. On IE this will display it a yellow alert 
+            // icon in the status bar and Firefox will display a script error.
+            if (!System.Diagnostics.Debugger.IsAttached)
+            {
+
+                // NOTE: This will allow the application to continue running after an exception has been thrown
+                // but not handled. 
+                // For production applications this error handling should be replaced with something that will 
+                // report the error to the website and stop the application.
+                e.Handled = true;
+                Deployment.Current.Dispatcher.BeginInvoke(delegate { ReportErrorToDOM(e); });
+            }
+        }
+        private void ReportErrorToDOM(ApplicationUnhandledExceptionEventArgs e)
+        {
+            try
+            {
+                string errorMsg = e.ExceptionObject.Message + e.ExceptionObject.StackTrace;
+                errorMsg = errorMsg.Replace('"', '\'').Replace("\r\n", @"\n");
+
+                System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(\"Unhandled Error in Silverlight 2 Application " + errorMsg + "\");");
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/App.xaml.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/AppManifest.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/AppManifest.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/AppManifest.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,5 @@
+?<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" EntryPointAssembly="ListBoxSample" EntryPointType="ListBoxSample.App" RuntimeVersion="2.0.31005.0">
+  <Deployment.Parts>
+    <AssemblyPart x:Name="ListBoxSample" Source="ListBoxSample.dll" />
+  </Deployment.Parts>
+</Deployment>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/AppManifest.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.dll
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.dll
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.pdb
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Bin/Debug/ListBoxSample.pdb
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,94 @@
+?<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{024DBEDB-6601-4C36-AC85-EA1177B95AB9}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ListBoxSample</RootNamespace>
+    <AssemblyName>ListBoxSample</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>ListBoxSample.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>ListBoxSample.App</SilverlightAppEntry>
+    <TestPageFileName>TestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows" />
+    <Reference Include="mscorlib" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Page.xaml.cs">
+      <DependentUpon>Page.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Page.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj.user
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj.user	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj.user	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,25 @@
+?<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}" xmlns="">
+        <SilverlightProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>DynamicPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <ShowWebRefOnDebugPrompt>True</ShowWebRefOnDebugPrompt>
+        </SilverlightProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/ListBoxSample.csproj.user
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,18 @@
+?<UserControl x:Class="ListBoxSample.Page"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    Width="400" Height="300">
+    <Grid x:Name="LayoutRoot" Background="White">
+        <TextBlock Name="textBlock" Height="30" Margin="50,50,0,0" VerticalAlignment="Top"/>
+        <ListBox Name="listBox" Height="200" Margin="50,100,150,0" VerticalAlignment="Top"  SelectionChanged="ListBox_SelectionChanged">
+            <ListBoxItem Content="Item 1"/>
+            <ListBoxItem Content="Item 2"/>
+            <ListBoxItem Content="Item 3"/>
+            <ListBoxItem Content="Item 4"/>
+            <ListBoxItem Content="Item 5"/>
+            <ListBoxItem Content="Item 6"/>
+            <ListBoxItem Content="Item 7"/>
+            <ListBoxItem Content="Item 8"/>
+        </ListBox>
+    </Grid>
+</UserControl>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,30 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace ListBoxSample
+{
+    public partial class Page : UserControl
+    {
+        public Page()
+        {
+            InitializeComponent();
+
+            textBlock.Text = "You selected no item.";
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ListBoxItem listBoxItem = ((sender as ListBox).SelectedItem as ListBoxItem);
+            textBlock.Text = "You selected " + listBoxItem.Content.ToString() + ".";
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Page.xaml.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AppManifest.xml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AppManifest.xml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AppManifest.xml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,6 @@
+?<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AppManifest.xml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AssemblyInfo.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AssemblyInfo.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,35 @@
+?using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ListBoxSample")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ListBoxSample")]
+[assembly: AssemblyCopyright("Copyright ?  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d2e57b82-f065-4047-9b8e-b4a1f7baf8e0")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/Properties/AssemblyInfo.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/App.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/App.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/App.g.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,52 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "108591D60A8BFE0654AF5908F64E8BD6"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace ListBoxSample {
+    
+    
+    public partial class App : System.Windows.Application {
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/ListBoxSample;component/App.xaml", System.UriKind.Relative));
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/App.g.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.csproj.FileListAbsolute.txt
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.csproj.FileListAbsolute.txt	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.csproj.FileListAbsolute.txt	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,12 @@
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\AppManifest.xaml
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\ListBoxSample.dll
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\ListBoxSample.pdb
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\ListBoxSample.xap
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\TestPage.html
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\App.g.cs
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\Page.g.cs
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\ListBoxSample.g.resources
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\ListBoxSample.dll
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\ListBoxSample.pdb
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\XapCacheFile.xml


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.csproj.FileListAbsolute.txt
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.dll
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.dll
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.g.resources
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.g.resources
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.pdb
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/ListBoxSample.pdb
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Page.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Page.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Page.g.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,61 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Page.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FEA1A3FFB012F8EAF54D7D55785FC6B9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace ListBoxSample {
+    
+    
+    public partial class Page : System.Windows.Controls.UserControl {
+        
+        internal System.Windows.Controls.Grid LayoutRoot;
+        
+        internal System.Windows.Controls.TextBlock textBlock;
+        
+        internal System.Windows.Controls.ListBox listBox;
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/ListBoxSample;component/Page.xaml", System.UriKind.Relative));
+            this.LayoutRoot = ((System.Windows.Controls.Grid)(this.FindName("LayoutRoot")));
+            this.textBlock = ((System.Windows.Controls.TextBlock)(this.FindName("textBlock")));
+            this.listBox = ((System.Windows.Controls.ListBox)(this.FindName("listBox")));
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/Page.g.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/XapCacheFile.xml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/XapCacheFile.xml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/XapCacheFile.xml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,4 @@
+<xapCache source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\ListBoxSample.xap" lastWriteTime="2009/9/1 16:44:51">
+  <file source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\obj\Debug\ListBoxSample.dll" archivePath="ListBoxSample.dll" lastWriteTime="2009/9/1 16:44:50" />
+  <file source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\ListBoxSample\ListBoxSample\Bin\Debug\AppManifest.xaml" archivePath="AppManifest.xaml" lastWriteTime="2009/8/31 15:43:17" />
+</xapCache>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample/obj/Debug/XapCacheFile.xml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.sln
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.sln	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.sln	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,20 @@
+?
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ListBoxSample", "ListBoxSample\ListBoxSample.csproj", "{024DBEDB-6601-4C36-AC85-EA1177B95AB9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{024DBEDB-6601-4C36-AC85-EA1177B95AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{024DBEDB-6601-4C36-AC85-EA1177B95AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{024DBEDB-6601-4C36-AC85-EA1177B95AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{024DBEDB-6601-4C36-AC85-EA1177B95AB9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.sln
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.suo
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample/ListBoxSample.suo
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.html
===================================================================
--- trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.html	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.html	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,77 @@
+?<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<!-- saved from url=(0014)about:internet -->
+<head>
+    <title>ListBoxSample</title>
+
+    <style type="text/css">
+    html, body {
+	    height: 100%;
+	    overflow: auto;
+    }
+    body {
+	    padding: 0;
+	    margin: 0;
+    }
+    #silverlightControlHost {
+	    height: 100%;
+    }
+    </style>
+    
+    <script type="text/javascript">
+        function onSilverlightError(sender, args) {
+        
+            var appSource = "";
+            if (sender != null && sender != 0) {
+                appSource = sender.getHost().Source;
+            } 
+            var errorType = args.ErrorType;
+            var iErrorCode = args.ErrorCode;
+            
+            var errMsg = "Unhandled Error in Silverlight 2 Application " +  appSource + "\n" ;
+
+            errMsg += "Code: "+ iErrorCode + "    \n";
+            errMsg += "Category: " + errorType + "       \n";
+            errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+            if (errorType == "ParserError")
+            {
+                errMsg += "File: " + args.xamlFile + "     \n";
+                errMsg += "Line: " + args.lineNumber + "     \n";
+                errMsg += "Position: " + args.charPosition + "     \n";
+            }
+            else if (errorType == "RuntimeError")
+            {           
+                if (args.lineNumber != 0)
+                {
+                    errMsg += "Line: " + args.lineNumber + "     \n";
+                    errMsg += "Position: " +  args.charPosition + "     \n";
+                }
+                errMsg += "MethodName: " + args.methodName + "     \n";
+            }
+
+            throw new Error(errMsg);
+        }
+    </script>
+</head>
+
+<body>
+    <!-- Runtime errors from Silverlight will be displayed here.
+	This will contain debugging information and should be removed or hidden when debugging is completed -->
+	<div id='errorLocation' style="font-size: small;color: Gray;"></div>
+
+    <div id="silverlightControlHost">
+		<object data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%">
+			<param name="source" value="ListBoxSample.xap"/>
+			<param name="onerror" value="onSilverlightError" />
+			<param name="background" value="white" />
+			<param name="minRuntimeVersion" value="2.0.31005.0" />
+			<param name="autoUpgrade" value="true" />
+			<a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
+     			<img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none"/>
+			</a>
+		</object>
+		<iframe style='visibility:hidden;height:0;width:0;border:0px'></iframe>
+    </div>
+</body>
+</html>


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.html
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.xap
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/listbox/ListBoxSample.xap
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,8 @@
+?<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             x:Class="PasswordBox.App"
+             >
+    <Application.Resources>
+        
+    </Application.Resources>
+</Application>


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,66 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PasswordBox
+{
+    public partial class App : Application
+    {
+
+        public App()
+        {
+            this.Startup += this.Application_Startup;
+            this.Exit += this.Application_Exit;
+            this.UnhandledException += this.Application_UnhandledException;
+
+            InitializeComponent();
+        }
+
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            this.RootVisual = new Page();
+        }
+
+        private void Application_Exit(object sender, EventArgs e)
+        {
+
+        }
+        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+        {
+            // If the app is running outside of the debugger then report the exception using
+            // the browser's exception mechanism. On IE this will display it a yellow alert 
+            // icon in the status bar and Firefox will display a script error.
+            if (!System.Diagnostics.Debugger.IsAttached)
+            {
+
+                // NOTE: This will allow the application to continue running after an exception has been thrown
+                // but not handled. 
+                // For production applications this error handling should be replaced with something that will 
+                // report the error to the website and stop the application.
+                e.Handled = true;
+                Deployment.Current.Dispatcher.BeginInvoke(delegate { ReportErrorToDOM(e); });
+            }
+        }
+        private void ReportErrorToDOM(ApplicationUnhandledExceptionEventArgs e)
+        {
+            try
+            {
+                string errorMsg = e.ExceptionObject.Message + e.ExceptionObject.StackTrace;
+                errorMsg = errorMsg.Replace('"', '\'').Replace("\r\n", @"\n");
+
+                System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(\"Unhandled Error in Silverlight 2 Application " + errorMsg + "\");");
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/App.xaml.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/AppManifest.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/AppManifest.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/AppManifest.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,5 @@
+?<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" EntryPointAssembly="PasswordBox" EntryPointType="PasswordBox.App" RuntimeVersion="2.0.31005.0">
+  <Deployment.Parts>
+    <AssemblyPart x:Name="PasswordBox" Source="PasswordBox.dll" />
+  </Deployment.Parts>
+</Deployment>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/AppManifest.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.dll
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.dll
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.pdb
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Bin/Debug/PasswordBox.pdb
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,9 @@
+?<UserControl x:Class="PasswordBox.Page"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    Width="400" Height="300">
+    <Grid x:Name="LayoutRoot" Background="White">
+        <TextBlock x:Name="textBlock" Height="30" Margin="30,50,0,0" VerticalAlignment="Top"/>
+        <PasswordBox x:Name="pwdBox" Height="30" Margin="30,100,30,0" VerticalAlignment="Top" MaxLength="64" PasswordChar="*" PasswordChanged="PasswordBox_PasswordChanged"/>
+    </Grid>
+</UserControl>


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,31 @@
+?using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace PasswordBox
+{
+    public partial class Page : UserControl
+    {
+        public Page()
+        {
+            InitializeComponent();
+        }
+
+        private int pwdChanges = 0;
+
+        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            int count = ++pwdChanges;
+            string s = count == 1 ? "" : "s";
+            textBlock.Text = string.Format("You changed {0} time{1}.", Convert.ToString(count), s);
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Page.xaml.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,94 @@
+?<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5592C7C1-2E00-4E2A-83F2-48457FD5608F}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PasswordBox</RootNamespace>
+    <AssemblyName>PasswordBox</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>PasswordBox.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>PasswordBox.App</SilverlightAppEntry>
+    <TestPageFileName>TestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows" />
+    <Reference Include="mscorlib" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Page.xaml.cs">
+      <DependentUpon>Page.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Page.xaml">
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj.user
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj.user	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj.user	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,25 @@
+?<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}" xmlns="">
+        <SilverlightProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>DynamicPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <ShowWebRefOnDebugPrompt>True</ShowWebRefOnDebugPrompt>
+        </SilverlightProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/PasswordBox.csproj.user
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AppManifest.xml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AppManifest.xml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AppManifest.xml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,6 @@
+?<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AppManifest.xml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AssemblyInfo.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,35 @@
+?using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PasswordBox")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PasswordBox")]
+[assembly: AssemblyCopyright("Copyright ?  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1ba92941-9256-42f6-830b-61bf20abd81b")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/Properties/AssemblyInfo.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/App.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/App.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/App.g.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,52 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "3446225024FE80A9B8887CCF60EDCBAC"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace PasswordBox {
+    
+    
+    public partial class App : System.Windows.Application {
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/PasswordBox;component/App.xaml", System.UriKind.Relative));
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/App.g.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/Page.g.cs
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/Page.g.cs	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/Page.g.cs	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,61 @@
+#pragma checksum "C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Page.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F48E0A65D6062A0C74675165519677E3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+
+namespace PasswordBox {
+    
+    
+    public partial class Page : System.Windows.Controls.UserControl {
+        
+        internal System.Windows.Controls.Grid LayoutRoot;
+        
+        internal System.Windows.Controls.TextBlock textBlock;
+        
+        internal System.Windows.Controls.PasswordBox pwdBox;
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Windows.Application.LoadComponent(this, new System.Uri("/PasswordBox;component/Page.xaml", System.UriKind.Relative));
+            this.LayoutRoot = ((System.Windows.Controls.Grid)(this.FindName("LayoutRoot")));
+            this.textBlock = ((System.Windows.Controls.TextBlock)(this.FindName("textBlock")));
+            this.pwdBox = ((System.Windows.Controls.PasswordBox)(this.FindName("pwdBox")));
+        }
+    }
+}


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/Page.g.cs
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.csproj.FileListAbsolute.txt	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.csproj.FileListAbsolute.txt	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,12 @@
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\AppManifest.xaml
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\PasswordBox.dll
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\PasswordBox.pdb
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\PasswordBox.xap
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\TestPage.html
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\App.g.cs
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\Page.g.cs
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\PasswordBox.g.resources
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\PasswordBox.dll
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\PasswordBox.pdb
+C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\XapCacheFile.xml


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.csproj.FileListAbsolute.txt
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.dll
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.dll
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.g.resources
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.g.resources
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.pdb
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/PasswordBox.pdb
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/XapCacheFile.xml
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/XapCacheFile.xml	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/XapCacheFile.xml	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,4 @@
+<xapCache source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\PasswordBox.xap" lastWriteTime="2009/9/1 17:34:44">
+  <file source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\obj\Debug\PasswordBox.dll" archivePath="PasswordBox.dll" lastWriteTime="2009/9/1 17:34:43" />
+  <file source="C:\Users\Neville\Documents\Visual Studio 2008\Projects\PasswordBox\PasswordBox\Bin\Debug\AppManifest.xaml" archivePath="AppManifest.xaml" lastWriteTime="2009/9/1 17:22:19" />
+</xapCache>
\ No newline at end of file


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox/obj/Debug/XapCacheFile.xml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.sln
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.sln	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.sln	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,20 @@
+?
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasswordBox", "PasswordBox\PasswordBox.csproj", "{5592C7C1-2E00-4E2A-83F2-48457FD5608F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5592C7C1-2E00-4E2A-83F2-48457FD5608F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5592C7C1-2E00-4E2A-83F2-48457FD5608F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5592C7C1-2E00-4E2A-83F2-48457FD5608F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5592C7C1-2E00-4E2A-83F2-48457FD5608F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.sln
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.suo
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox/PasswordBox.suo
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox.xap
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/PasswordBox.xap
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/passwordbox/TestPage.html
===================================================================
--- trunk/uia2atk/test/samples/moonlight/passwordbox/TestPage.html	                        (rev 0)
+++ trunk/uia2atk/test/samples/moonlight/passwordbox/TestPage.html	2009-09-01 10:08:36 UTC (rev 141023)
@@ -0,0 +1,77 @@
+?<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<!-- saved from url=(0014)about:internet -->
+<head>
+    <title>PasswordBox</title>
+
+    <style type="text/css">
+    html, body {
+	    height: 100%;
+	    overflow: auto;
+    }
+    body {
+	    padding: 0;
+	    margin: 0;
+    }
+    #silverlightControlHost {
+	    height: 100%;
+    }
+    </style>
+    
+    <script type="text/javascript">
+        function onSilverlightError(sender, args) {
+        
+            var appSource = "";
+            if (sender != null && sender != 0) {
+                appSource = sender.getHost().Source;
+            } 
+            var errorType = args.ErrorType;
+            var iErrorCode = args.ErrorCode;
+            
+            var errMsg = "Unhandled Error in Silverlight 2 Application " +  appSource + "\n" ;
+
+            errMsg += "Code: "+ iErrorCode + "    \n";
+            errMsg += "Category: " + errorType + "       \n";
+            errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+            if (errorType == "ParserError")
+            {
+                errMsg += "File: " + args.xamlFile + "     \n";
+                errMsg += "Line: " + args.lineNumber + "     \n";
+                errMsg += "Position: " + args.charPosition + "     \n";
+            }
+            else if (errorType == "RuntimeError")
+            {           
+                if (args.lineNumber != 0)
+                {
+                    errMsg += "Line: " + args.lineNumber + "     \n";
+                    errMsg += "Position: " +  args.charPosition + "     \n";
+                }
+                errMsg += "MethodName: " + args.methodName + "     \n";
+            }
+
+            throw new Error(errMsg);
+        }
+    </script>
+</head>
+
+<body>
+    <!-- Runtime errors from Silverlight will be displayed here.
+	This will contain debugging information and should be removed or hidden when debugging is completed -->
+	<div id='errorLocation' style="font-size: small;color: Gray;"></div>
+
+    <div id="silverlightControlHost">
+		<object data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%">
+			<param name="source" value="PasswordBox.xap"/>
+			<param name="onerror" value="onSilverlightError" />
+			<param name="background" value="white" />
+			<param name="minRuntimeVersion" value="2.0.31005.0" />
+			<param name="autoUpgrade" value="true" />
+			<a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
+     			<img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none"/>
+			</a>
+		</object>
+		<iframe style='visibility:hidden;height:0;width:0;border:0px'></iframe>
+    </div>
+</body>
+</html>


Property changes on: trunk/uia2atk/test/samples/moonlight/passwordbox/TestPage.html
___________________________________________________________________
Added: svn:executable
   + *


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:11:05 2009
From: mono-patches-list at lists.ximian.com (Calen Chen (cachen@novell.com))
Date: Tue,  1 Sep 2009 06:11:05 -0400 (EDT)
Subject: [Mono-patches] r141024 - in
	trunk/uia2atk/test/samples/moonlight/mediaelement: . ClientBin
Message-ID: <20090901101105.6EA7D9472C@mono-cvs.ximian.com>

Author: cachen
Date: 2009-09-01 06:11:05 -0400 (Tue, 01 Sep 2009)
New Revision: 141024

Added:
   trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/
   trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/MediaElementSample.xap
   trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/media.wmv
Removed:
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.xap
Modified:
   trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html
Log:
update MediaElementSample.html and media source

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/MediaElementSample.xap
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/MediaElementSample.xap
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/media.wmv
===================================================================
(Binary files differ)


Property changes on: trunk/uia2atk/test/samples/moonlight/mediaelement/ClientBin/media.wmv
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html
===================================================================
--- trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html	2009-09-01 10:08:36 UTC (rev 141023)
+++ trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.html	2009-09-01 10:11:05 UTC (rev 141024)
@@ -17,7 +17,7 @@
 	    height: 100%;
     }
     </style>
-    
+    <script type="text/javascript" src="Silverlight.js"></script>
     <script type="text/javascript">
         function onSilverlightError(sender, args) {
         
@@ -61,8 +61,8 @@
 	<div id='errorLocation' style="font-size: small;color: Gray;"></div>
 
     <div id="silverlightControlHost">
-		<object data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%">
-			<param name="source" value="MediaElementSample.xap"/>
+		<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" width="100%" height="100%">
+			<param name="source" value="ClientBin/MediaElementSample.xap"/>
 			<param name="onerror" value="onSilverlightError" />
 			<param name="background" value="white" />
 			<param name="minRuntimeVersion" value="2.0.31005.0" />

Deleted: trunk/uia2atk/test/samples/moonlight/mediaelement/MediaElementSample.xap
===================================================================
(Binary files differ)


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:16:11 2009
From: mono-patches-list at lists.ximian.com (Ankit Jain (radical@corewars.org))
Date: Tue,  1 Sep 2009 06:16:11 -0400 (EDT)
Subject: [Mono-patches] r141025 -
	trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine
Message-ID: <20090901101611.089DF9472C@mono-cvs.ximian.com>

Author: ankit
Date: 2009-09-01 06:16:10 -0400 (Tue, 01 Sep 2009)
New Revision: 141025

Modified:
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
   trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
Log:
Fix bug #534965.
* Project.cs (BuildTarget): Move caching of target outputs to ..
* Target.cs: .. here. Move LogTargetSkipped also here.
Ensure that caching happens for target dependencies also.

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 10:11:05 UTC (rev 141024)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 10:16:10 UTC (rev 141025)
@@ -1,5 +1,12 @@
 2009-09-01  Ankit Jain  <jankit at novell.com>
 
+	Fix bug #534965.
+	* Project.cs (BuildTarget): Move caching of target outputs to ..
+	* Target.cs: .. here. Move LogTargetSkipped also here.
+	Ensure that caching happens for target dependencies also.
+
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
 	* DirectoryScanner.cs (Scan): Ignore empty entries in includes and
 	excludes.
 

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs	2009-09-01 10:11:05 UTC (rev 141024)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs	2009-09-01 10:16:10 UTC (rev 141025)
@@ -313,40 +313,32 @@
 			return true;
 		}
 
-		bool BuildTarget (string target, IDictionary targetOutputs)
+		bool BuildTarget (string target_name, IDictionary targetOutputs)
 		{
-			if (target == null)
+			if (target_name == null)
 				throw new ArgumentException ("targetNames cannot contain null strings");
 
-			if (!targets.Exists (target)) {
+			if (!targets.Exists (target_name)) {
 				//FIXME: Log this!
-				Console.WriteLine ("Target named '{0}' not found in the project.", target);
+				Console.WriteLine ("Target named '{0}' not found in the project.", target_name);
 				return false;
 			}
 
-			// built targets are keyed by the particular set of global
-			// properties. So, a different set could allow a target
-			// to run again
-			string key = fullFileName + ":" + target + ":" + GlobalPropertiesToString (GlobalProperties);
-			ITaskItem[] outputs;
-			if (ParentEngine.BuiltTargetsOutputByName.TryGetValue (key, out outputs)) {
-				if (targetOutputs != null)
-					targetOutputs.Add (target, outputs);
-				LogTargetSkipped (target);
-				return true;
-			}
-
-			if (!targets [target].Build ())
+			string key = GetKeyForTarget (target_name);
+			if (!targets [target_name].Build (key))
 				return false;
 
-			ParentEngine.BuiltTargetsOutputByName [key] = (ITaskItem[]) targets [target].Outputs.Clone ();
-			builtTargetKeys.Add (key);
+			ITaskItem[] outputs = ParentEngine.BuiltTargetsOutputByName [key];
 			if (targetOutputs != null)
-				targetOutputs.Add (target, targets [target].Outputs);
-
+				targetOutputs.Add (target_name, outputs);
 			return true;
 		}
 
+		internal string GetKeyForTarget (string target_name)
+		{
+			return fullFileName + ":" + target_name + ":" + GlobalPropertiesToString (GlobalProperties);
+		}
+
 		string GlobalPropertiesToString (BuildPropertyGroup bgp)
 		{
 			StringBuilder sb = new StringBuilder ();
@@ -1095,16 +1087,6 @@
 			return default (T);
 		}
 
-		void LogTargetSkipped (string targetName)
-		{
-			BuildMessageEventArgs bmea;
-			bmea = new BuildMessageEventArgs (String.Format (
-						"Target {0} skipped, as it has already been built.", targetName),
-					null, null, MessageImportance.Low);
-
-			ParentEngine.EventSource.FireMessageRaised (this, bmea);
-		}
-
 		void LogWarning (string filename, string message, params object[] messageArgs)
 		{
 			BuildWarningEventArgs bwea = new BuildWarningEventArgs (
@@ -1217,6 +1199,10 @@
 			get { return xmlDocument.InnerXml; }
 		}
 
+		internal List<string> BuiltTargetKeys {
+			get { return builtTargetKeys; }
+		}
+
 		internal Dictionary <string, BuildItemGroup> LastItemGroupContaining {
 			get { return last_item_group_containing; }
 		}

Modified: trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs	2009-09-01 10:11:05 UTC (rev 141024)
+++ trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs	2009-09-01 10:16:10 UTC (rev 141025)
@@ -110,17 +110,32 @@
 			buildTasks.Remove (buildTask);
 		}
 
-		internal bool Build ()
+		bool Build ()
 		{
+			return Build (null);
+		}
+
+		internal bool Build (string built_targets_key)
+		{
 			bool executeOnErrors;
-			return Build (out executeOnErrors);
+			return Build (built_targets_key, out executeOnErrors);
 		}
 
-		internal bool Build (out bool executeOnErrors)
+		bool Build (string built_targets_key, out bool executeOnErrors)
 		{
 			bool result = false;
 			executeOnErrors = false;
 
+			// built targets are keyed by the particular set of global
+			// properties. So, a different set could allow a target
+			// to run again
+			built_targets_key = project.GetKeyForTarget (Name);
+			ITaskItem[] outputs;
+			if (project.ParentEngine.BuiltTargetsOutputByName.ContainsKey (built_targets_key)) {
+				LogTargetSkipped ();
+				return true;
+			}
+
 			if (!ConditionParser.ParseAndEvaluate (Condition, Project)) {
 				LogMessage (MessageImportance.Low,
 						"Target {0} skipped due to false condition: {1}",
@@ -145,6 +160,9 @@
 				return false;
 			}
 
+			project.ParentEngine.BuiltTargetsOutputByName [built_targets_key] = (ITaskItem[]) Outputs.Clone ();
+			project.BuiltTargetKeys.Add (built_targets_key);
+
 			return result;
 		}
 
@@ -176,7 +194,7 @@
 			executeOnErrors = false;
 			foreach (Target t in deps) {
 				if (t.BuildState == BuildState.NotStarted)
-					if (!t.Build (out executeOnErrors))
+					if (!t.Build (null, out executeOnErrors))
 						return false;
 				if (t.BuildState == BuildState.Started)
 					throw new InvalidProjectFileException ("Cycle in target dependencies detected");
@@ -228,6 +246,16 @@
 			}
 		}
 
+		void LogTargetSkipped ()
+		{
+			BuildMessageEventArgs bmea;
+			bmea = new BuildMessageEventArgs (String.Format (
+						"Target {0} skipped, as it has already been built.", Name),
+					null, null, MessageImportance.Low);
+
+			project.ParentEngine.EventSource.FireMessageRaised (this, bmea);
+		}
+
 		void LogError (string message, params object [] messageArgs)
 		{
 			if (message == null)


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:38:04 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 06:38:04 -0400 (EDT)
Subject: [Mono-patches] r141026 -
	trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb
Message-ID: <20090901103804.AE6F89472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 06:38:04 -0400 (Tue, 01 Sep 2009)
New Revision: 141026

Modified:
   trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog
   trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
   trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs
Log:
* Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs:
* Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs: Breakpoint activation
  while running was not supported by mono 2.4.2.

Modified: trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog
===================================================================
--- trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog	2009-09-01 10:16:10 UTC (rev 141025)
+++ trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog	2009-09-01 10:38:04 UTC (rev 141026)
@@ -1,3 +1,9 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MdbAdaptor-2-4-4.cs:
+	* MdbAdaptor-2-4-2.cs: Breakpoint activation while running was
+	  not supported by mono 2.4.2.
+
 2009-08-28  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MdbObjectValueAdaptor.cs: Fixed some issue with static

Modified: trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
===================================================================
--- trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	2009-09-01 10:16:10 UTC (rev 141025)
+++ trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	2009-09-01 10:38:04 UTC (rev 141026)
@@ -67,22 +67,25 @@
 		
 		public override void ActivateEvent (Mono.Debugger.Event ev)
 		{
-			Process.ActivatePendingBreakpoints ();
+			if (Process.MainThread.IsStopped)
+				ev.Activate (Process.MainThread);
+			else
+				ThrowNotSupported ("Breakpoints can't be changed while the process is running.");
 		}
 		
 		public override void RemoveEvent (Mono.Debugger.Event ev)
 		{
-			Session.RemoveEvent (ev);
-			Process.ActivatePendingBreakpoints ();
+			if (!Process.MainThread.IsStopped)
+				ThrowNotSupported ("Breakpoints can't be changed while the process is running.");
+			Session.DeleteEvent (ev);
 		}
 		
 		public override void EnableEvent (Mono.Debugger.Event ev, bool enable)
 		{
 			if (enable)
-				Session.ActivateEventAsync (ev);
+				ev.Activate (Process.MainThread);
 			else
-				Session.DeactivateEventAsync (ev);
-			Process.ActivatePendingBreakpoints ();
+				ev.Deactivate (Process.MainThread);
 		}
 	}
 }

Modified: trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs
===================================================================
--- trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs	2009-09-01 10:16:10 UTC (rev 141025)
+++ trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs	2009-09-01 10:38:04 UTC (rev 141026)
@@ -30,5 +30,24 @@
 {
 	public class MdbAdaptor_2_4_4: MdbAdaptor_2_4_2
 	{
+		public override void ActivateEvent (Mono.Debugger.Event ev)
+		{
+			Process.ActivatePendingBreakpoints ();
+		}
+		
+		public override void RemoveEvent (Mono.Debugger.Event ev)
+		{
+			Session.RemoveEvent (ev);
+			Process.ActivatePendingBreakpoints ();
+		}
+		
+		public override void EnableEvent (Mono.Debugger.Event ev, bool enable)
+		{
+			if (enable)
+				Session.ActivateEventAsync (ev);
+			else
+				Session.DeactivateEventAsync (ev);
+			Process.ActivatePendingBreakpoints ();
+		}
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:45:44 2009
From: mono-patches-list at lists.ximian.com (Carlos Alberto Cortes (calberto.cortez@gmail.com))
Date: Tue,  1 Sep 2009 06:45:44 -0400 (EDT)
Subject: [Mono-patches] r141027 -
	trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms
Message-ID: <20090901104544.EDECA9472C@mono-cvs.ximian.com>

Author: calberto
Date: 2009-09-01 06:45:44 -0400 (Tue, 01 Sep 2009)
New Revision: 141027

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
Log:
2009-09-01  Carlos Alberto Cortez <calberto.cortez at gmail.com>

	* RichTextBox.cs: When saving the text to a file using SaveFile use
	Environment.NewLine to separate the lines. This way we should be
	saving the files according to the system.
	Fixes the remaining part of #511515.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2009-09-01 10:38:04 UTC (rev 141026)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2009-09-01 10:45:44 UTC (rev 141027)
@@ -1,3 +1,10 @@
+2009-09-01  Carlos Alberto Cortez <calberto.cortez at gmail.com>
+
+	* RichTextBox.cs: When saving the text to a file using SaveFile use
+	Environment.NewLine to separate the lines. This way we should be
+	saving the files according to the system.
+	Fixes the remaining part of #511515.
+
 2009-08-31  Carlos Alberto Cortez <calberto.cortez at gmail.com>
 
 	* RichText.cs: Remove some unix new line characters and use

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs	2009-09-01 10:38:04 UTC (rev 141026)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs	2009-09-01 10:45:44 UTC (rev 141027)
@@ -1082,7 +1082,9 @@
 					}
 
 					for (i = 1; i < document.Lines; i++) {
-						bytes = encoding.GetBytes(document.GetLine(i).text.ToString());
+						// Normalize the new lines to the system ones
+						string line_text = document.GetLine (i).TextWithoutEnding () + Environment.NewLine;
+						bytes = encoding.GetBytes(line_text);
 						data.Write(bytes, 0, bytes.Length);
 					}
 					bytes = encoding.GetBytes(document.GetLine(document.Lines).text.ToString());


From mono-patches-list at lists.ximian.com  Tue Sep  1 06:49:34 2009
From: mono-patches-list at lists.ximian.com (Gonzalo Paniagua)
Date: Tue,  1 Sep 2009 06:49:34 -0400 (EDT)
Subject: [Mono-patches] r141028 - trunk/mcs/class/corlib/System
Message-ID: <20090901104934.E7DAF9472C@mono-cvs.ximian.com>

Author: gonzalo
Date: 2009-09-01 06:49:34 -0400 (Tue, 01 Sep 2009)
New Revision: 141028

Modified:
   trunk/mcs/class/corlib/System/Buffer.cs
Log:
typo

Modified: trunk/mcs/class/corlib/System/Buffer.cs
===================================================================
--- trunk/mcs/class/corlib/System/Buffer.cs	2009-09-01 10:45:44 UTC (rev 141027)
+++ trunk/mcs/class/corlib/System/Buffer.cs	2009-09-01 10:49:34 UTC (rev 141028)
@@ -110,7 +110,7 @@
 				// watch for integer overflow
 				if ((srcOffset > ByteLength (src) - count) || (dstOffset > ByteLength (dst) - count))
 					throw new ArgumentException (Locale.GetText (
-						"Offset and length were out of bounds for the array or count is greater than" + 
+						"Offset and length were out of bounds for the array or count is greater than " + 
 						"the number of elements from index to the end of the source collection."));
 			}
 		}


From mono-patches-list at lists.ximian.com  Tue Sep  1 07:30:56 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 07:30:56 -0400 (EDT)
Subject: [Mono-patches] r141029 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: . PyBinding.Parser.Dom
Message-ID: <20090901113056.6ACDF9472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 07:30:56 -0400 (Tue, 01 Sep 2009)
New Revision: 141029

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs
Log:
* PythonCompilationUnit.cs: Use "md-package" for the python package
  icon. Add some FIXME's. Keep a copy of instantiated DomType,
  DomField, and DomMethod for later use by resolver.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 10:49:34 UTC (rev 141028)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 11:30:56 UTC (rev 141029)
@@ -1,5 +1,12 @@
 2009-09-01  Christian Hergert  <chris at dronelabs.com>
 
+	* PyBinding.Parser.Dom/PythonCompilationUnit.cs: Use
+	  "md-package" for the python package icon. Add some FIXME's.
+	  Keep a copy of instantiated DomType, DomField, and DomMethod
+	  for later use by resolver.
+
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
 	* PyBinding.Parser/ParserDatabase.cs: Handle the case where
 	  there is no completion database created.
 

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs	2009-09-01 10:49:34 UTC (rev 141028)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs	2009-09-01 11:30:56 UTC (rev 141029)
@@ -31,6 +31,8 @@
 	[Serializable]
 	public class PythonCompilationUnit : CompilationUnit
 	{
+		List<IBaseMember> m_AllWrapped = new List<IBaseMember> ();
+		
 		public PythonCompilationUnit (string fileName) : base (fileName)
 		{
 		}
@@ -39,6 +41,10 @@
 			get;
 			set;
 		}
+		
+		internal List<IBaseMember> AllWrapped {
+			get { return m_AllWrapped; }
+		}
 
 		public void Build ()
 		{
@@ -46,14 +52,15 @@
 				return;
 
 			// fake class containing modules funcs
-			var module = new DomType () {
+			var module = new PackageDomType () {
 				Name       = PythonHelper.ModuleFromFilename (FileName),
 				ClassType  = ClassType.Unknown,
 				Location   = new DomLocation (0, 0),
 				BodyRegion = Module.Region,
 			};
+			m_AllWrapped.Add (module);
 			Add (module);
-
+			
 			// module functions
 			foreach (IMethod method in BuildFunctions (Module.Functions))
 				module.Add (method);
@@ -78,6 +85,7 @@
 					BodyRegion    = pyClass.Region,
 					Location      = new DomLocation (pyClass.Region.Start.Line - 1, 0),
 				};
+				m_AllWrapped.Add (domType);
 				Add (domType);
 
 				// class functions
@@ -100,8 +108,12 @@
 					Name       = pyAttr.Name,
 					BodyRegion = pyAttr.Region,
 					Location   = pyAttr.Region.Start,
-					ReturnType = new DomReturnType { Name = pyAttr.Name },
+					ReturnType = new DomReturnType () {
+						Name      = pyAttr.Name, // FIXME: Get inferred type
+						Namespace = Module.FullName,
+					},
 				};
+				m_AllWrapped.Add (domAttr);
 				yield return domAttr;
 			}
 		}
@@ -118,22 +130,36 @@
 					Documentation = pyFunc.Documentation,
 					BodyRegion    = pyFunc.Region,
 					Location      = new DomLocation (pyFunc.Region.Start.Line - 1, 0),
-					ReturnType    = new DomReturnType () { Name = String.Empty },
+					ReturnType    = new DomReturnType () {
+						Name      = pyFunc.Name, // FIXME: Get inferred type
+						Namespace = Module.FullName,
+					},
 				};
+				m_AllWrapped.Add (domFunc);
 
 				foreach (PythonArgument pyArg in pyFunc.Arguments)
 				{
 					var domArg = new DomParameter () {
 						Name       = pyArg.Name,
 						ReturnType = new DomReturnType () {
-							Name   = pyArg.Name,
+							Name      = pyArg.Name, // FIXME: Get inferred type
+							Namespace = Module.FullName,
 						},
 					};
+					m_AllWrapped.Add (domArg);
 					domFunc.Add (domArg);
 				}
 
 				yield return domFunc;
 			}
 		}
+		
+		class PackageDomType: DomType
+		{
+			
+			public override string StockIcon {
+				get { return "md-package"; }
+			}
+		}
 	}
 }
\ No newline at end of file


From mono-patches-list at lists.ximian.com  Tue Sep  1 07:45:37 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 07:45:37 -0400 (EDT)
Subject: [Mono-patches] r141030 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: .
	PyBinding.Gui.Navigation
Message-ID: <20090901114537.8504D9472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 07:45:37 -0400 (Tue, 01 Sep 2009)
New Revision: 141030

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs
Log:
* PackageNodeBuilder.cs:
* PackagesNodeBuilder.cs: Use "md-package" stock icon to be
  consistent.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 11:30:56 UTC (rev 141029)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 11:45:37 UTC (rev 141030)
@@ -1,5 +1,11 @@
 2009-09-01  Christian Hergert  <chris at dronelabs.com>
 
+	* PyBinding.Gui.Navigation/PackageNodeBuilder.cs:
+	* PyBinding.Gui.Navigation/PackagesNodeBuilder.cs: Use
+	  "md-package" stock icon to be consistent.
+
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
 	* PyBinding.Parser.Dom/PythonCompilationUnit.cs: Use
 	  "md-package" for the python package icon. Add some FIXME's.
 	  Keep a copy of instantiated DomType, DomField, and DomMethod

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs	2009-09-01 11:30:56 UTC (rev 141029)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs	2009-09-01 11:45:37 UTC (rev 141030)
@@ -78,7 +78,7 @@
 			PackageNode packageNode = dataObject as PackageNode;
 
 			label = packageNode.Name;
-			icon = Context.GetIcon (Stock.NameSpace);
+			icon = Context.GetIcon ("md-package");
 		}
 
 		public override void BuildChildNodes (ITreeBuilder treeBuilder,

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs	2009-09-01 11:30:56 UTC (rev 141029)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs	2009-09-01 11:45:37 UTC (rev 141030)
@@ -63,7 +63,7 @@
 		                                ref Gdk.Pixbuf closedIcon)
 		{
 			label = GettextCatalog.GetString ("Packages");
-			icon = Context.GetIcon (Stock.NameSpace);
+			icon = Context.GetIcon ("md-package");
 		}
 
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
@@ -84,7 +84,7 @@
 					{
 						treeBuilder.AddChild (new PackageNode () {
 							Name = PythonHelper.ModuleFromFilename (projectFile.Name),
-							ProjectFile = projectFile
+							ProjectFile = projectFile,
 						});
 					}
 				}


From mono-patches-list at lists.ximian.com  Tue Sep  1 07:59:55 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 07:59:55 -0400 (EDT)
Subject: [Mono-patches] r141031 - in
	branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1: .
	Mono.Debugging.Server.Mdb
Message-ID: <20090901115955.BFECB9472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 07:59:55 -0400 (Tue, 01 Sep 2009)
New Revision: 141031

Modified:
   branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/
   branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/ChangeLog
   branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
   branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs
Log:
2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>

	* MdbAdaptor-2-4-4.cs:
	* MdbAdaptor-2-4-2.cs: Breakpoint activation while running was
	  not supported by mono 2.4.2.




Property changes on: branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/monodevelop/extras/MonoDevelop.Debugger.Mdb:141026

Modified: branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/ChangeLog
===================================================================
--- branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/ChangeLog	2009-09-01 11:45:37 UTC (rev 141030)
+++ branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/ChangeLog	2009-09-01 11:59:55 UTC (rev 141031)
@@ -1,3 +1,9 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MdbAdaptor-2-4-4.cs:
+	* MdbAdaptor-2-4-2.cs: Breakpoint activation while running was
+	  not supported by mono 2.4.2.
+
 2009-08-28  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MdbObjectValueAdaptor.cs: Fixed some issue with static

Modified: branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
===================================================================
--- branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	2009-09-01 11:45:37 UTC (rev 141030)
+++ branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	2009-09-01 11:59:55 UTC (rev 141031)
@@ -67,22 +67,25 @@
 		
 		public override void ActivateEvent (Mono.Debugger.Event ev)
 		{
-			Process.ActivatePendingBreakpoints ();
+			if (Process.MainThread.IsStopped)
+				ev.Activate (Process.MainThread);
+			else
+				ThrowNotSupported ("Breakpoints can't be changed while the process is running.");
 		}
 		
 		public override void RemoveEvent (Mono.Debugger.Event ev)
 		{
-			Session.RemoveEvent (ev);
-			Process.ActivatePendingBreakpoints ();
+			if (!Process.MainThread.IsStopped)
+				ThrowNotSupported ("Breakpoints can't be changed while the process is running.");
+			Session.DeleteEvent (ev);
 		}
 		
 		public override void EnableEvent (Mono.Debugger.Event ev, bool enable)
 		{
 			if (enable)
-				Session.ActivateEventAsync (ev);
+				ev.Activate (Process.MainThread);
 			else
-				Session.DeactivateEventAsync (ev);
-			Process.ActivatePendingBreakpoints ();
+				ev.Deactivate (Process.MainThread);
 		}
 	}
 }

Modified: branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs
===================================================================
--- branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs	2009-09-01 11:45:37 UTC (rev 141030)
+++ branches/monodevelop/extras/MonoDevelop.Debugger.Mdb/2.1/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-4.cs	2009-09-01 11:59:55 UTC (rev 141031)
@@ -30,5 +30,24 @@
 {
 	public class MdbAdaptor_2_4_4: MdbAdaptor_2_4_2
 	{
+		public override void ActivateEvent (Mono.Debugger.Event ev)
+		{
+			Process.ActivatePendingBreakpoints ();
+		}
+		
+		public override void RemoveEvent (Mono.Debugger.Event ev)
+		{
+			Session.RemoveEvent (ev);
+			Process.ActivatePendingBreakpoints ();
+		}
+		
+		public override void EnableEvent (Mono.Debugger.Event ev, bool enable)
+		{
+			if (enable)
+				Session.ActivateEventAsync (ev);
+			else
+				Session.DeactivateEventAsync (ev);
+			Process.ActivatePendingBreakpoints ();
+		}
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:07:02 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 08:07:02 -0400 (EDT)
Subject: [Mono-patches] r141032 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Ide: .
	MonoDevelop.Ide.Commands MonoDevelop.Ide.Gui
	MonoDevelop.Ide.Gui.Pads.ProjectPad
Message-ID: <20090901120702.55A339472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 08:07:02 -0400 (Tue, 01 Sep 2009)
New Revision: 141032

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchLayout.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
Log:
* MonoDevelop.Ide.Gui/Pad.cs:
* MonoDevelop.Ide.Gui/Workbench.cs:
* MonoDevelop.Ide.Gui/IPadContainer.cs:
* MonoDevelop.Ide.Gui/DocumentSwitcher.cs:
* MonoDevelop.Ide.Gui/IWorkbenchLayout.cs:
* MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
* MonoDevelop.Ide.Commands/ViewCommands.cs:
* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs: Fixed
  "Bug 489819 - Building the project removes focus from the
  texteditor".

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 12:07:02 UTC (rev 141032)
@@ -1,5 +1,19 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Ide.Gui/Pad.cs:
+	* MonoDevelop.Ide.Gui/Workbench.cs:
+	* MonoDevelop.Ide.Gui/IPadContainer.cs:
+	* MonoDevelop.Ide.Gui/DocumentSwitcher.cs:
+	* MonoDevelop.Ide.Gui/IWorkbenchLayout.cs:
+	* MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
+	* MonoDevelop.Ide.Commands/ViewCommands.cs:
+	* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs:
+	* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
+	  Fixed "Bug 489819 - Building the project removes focus from
+	  the texteditor".
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs: Now using
 	  (the more correct) shorten type name method from compilation
 	  unit.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -114,7 +114,7 @@
 			if (dataItem == null) return; 
 			Pad pad = (Pad)dataItem;
 			pad.Visible = true;
-			pad.BringToFront ();
+			pad.BringToFront (true);
 		}
 	}
 

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -397,7 +397,7 @@
 			if (!layout.IsVisible (content))
 				layout.ShowPad (content);
 
-			layout.ActivatePad (content);
+			layout.ActivatePad (content, false);
 		}
 		
 		public void RedrawAllComponents()

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -339,7 +339,7 @@
 				} else {
 					Pad pad = SelectedPad;
 					if (pad != null)
-						pad.BringToFront ();
+						pad.BringToFront (true);
 				}
 				ret = base.OnKeyReleaseEvent (evnt);
 				Gtk.Window parent = this.TransientFor;

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -46,7 +46,7 @@
 		bool Sticky { get; set; }
 		IPadContent Content { get; }
 		
-		void Activate ();
+		void Activate (bool giveFocus);
 		
 		event EventHandler PadShown;
 		event EventHandler PadHidden;
@@ -145,10 +145,10 @@
 			}
 		}
 		
-		public void Activate ()
+		public void Activate (bool giveFocus)
 		{
 			CreateContent ();
-			layout.ActivatePad (codon);
+			layout.ActivatePad (codon, giveFocus);
 		}
 		
 		void CreateContent ()

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchLayout.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchLayout.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchLayout.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -89,7 +89,7 @@
 		/// Activates a pad (Show only makes it visible but Activate does
 		/// bring it to foreground)
 		/// </summary>
-		void ActivatePad(PadCodon content);
+		void ActivatePad(PadCodon content, bool giveFocus);
 		
 		/// <summary>
 		/// Hides a new <see cref="IPadContent"/>.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -87,8 +87,16 @@
 		
 		public void BringToFront ()
 		{
+			BringToFront (false);
+		}
+		
+		public void BringToFront (bool grabFocus)
+		{
 			PadWindow.LastActivePadWindow = window;
+			// TODO: Is bringToFront really required, or is Activate (grabFocus) enough ?
 			workbench.BringToFront (content);
+			if (grabFocus)
+				window.Activate (grabFocus);
 		}
 		
 		public bool Visible {

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -584,11 +584,11 @@
 				item.Visible = false;
 		}
 		
-		public void ActivatePad (PadCodon padContent)
+		public void ActivatePad (PadCodon padContent, bool giveFocus)
 		{
 			DockItem item = GetDockItem (padContent);
 			if (item != null)
-				item.Present (true);
+				item.Present (giveFocus);
 		}
 		
 		public bool IsSticky (PadCodon padContent)

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -503,7 +503,7 @@
 			
 			Pad pad = GetLocationListPad ();
 			if (pad != null) {
-				pad.BringToFront ();
+				pad.BringToFront (true);
 				ILocationListPad loc = (ILocationListPad) pad.Content;
 				string file;
 				int lin, col;
@@ -520,7 +520,7 @@
 			
 			Pad pad = GetLocationListPad ();
 			if (pad != null) {
-				pad.BringToFront ();
+				pad.BringToFront (true);
 				ILocationListPad loc = (ILocationListPad) pad.Content;
 				string file;
 				int lin, col;

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs	2009-09-01 11:59:55 UTC (rev 141031)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs	2009-09-01 12:07:02 UTC (rev 141032)
@@ -331,7 +331,7 @@
 			foreach (Pad pad in IdeApp.Workbench.Pads) {
 				if (pad.Id == "MonoDevelop.DesignerSupport.PropertyPad") {
 					pad.Visible = true;
-					pad.BringToFront ();
+					pad.BringToFront (true);
 					return;
 				}
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:10:05 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 08:10:05 -0400 (EDT)
Subject: [Mono-patches] r141033 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport:
	. MonoDevelop.DesignerSupport.Projects
Message-ID: <20090901121005.3A5789472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 08:10:05 -0400 (Tue, 01 Sep 2009)
New Revision: 141033

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs
Log:
* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs: Fix
  bu #535825 - Property pad should be disabled when multiple items
  selected.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog	2009-09-01 12:07:02 UTC (rev 141032)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog	2009-09-01 12:10:05 UTC (rev 141033)
@@ -1,3 +1,9 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs:
+	  Fix bu #535825 - Property pad should be disabled when
+	  multiple items selected.
+
 2009-08-28  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fixed Bug

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs	2009-09-01 12:07:02 UTC (rev 141032)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs	2009-09-01 12:10:05 UTC (rev 141033)
@@ -24,7 +24,10 @@
 	{
 		public object GetActiveComponent ()
 		{
-			return CurrentNode.DataItem;
+			if (CurrentNodes.Length == 1)
+				return CurrentNode.DataItem;
+			else
+				return null;
 		}
 		
 		public object GetProvider ()


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:26:31 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 08:26:31 -0400 (EDT)
Subject: [Mono-patches] r141034 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui: .
	MonoDevelop.Core.Gui
Message-ID: <20090901122631.1DAA89472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 08:26:30 -0400 (Tue, 01 Sep 2009)
New Revision: 141034

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/MessageService.cs
Log:
* MonoDevelop.Core.Gui/MessageService.cs: Use OK as default button
  for informative dialogs.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/ChangeLog	2009-09-01 12:10:05 UTC (rev 141033)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/ChangeLog	2009-09-01 12:26:30 UTC (rev 141034)
@@ -1,3 +1,8 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.Core.Gui/MessageService.cs: Use OK as default
+	  button for informative dialogs.
+
 2009-08-31  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MonoDevelop.Core.Gui\SyncContextAttribute.cs: When running

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/MessageService.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/MessageService.cs	2009-09-01 12:10:05 UTC (rev 141033)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/MessageService.cs	2009-09-01 12:26:30 UTC (rev 141034)
@@ -191,7 +191,7 @@
 		}
 		public static void ShowMessage (Gtk.Window parent, string primaryText, string secondaryText)
 		{
-			GenericAlert (Stock.Information, primaryText, secondaryText, AlertButton.Cancel);
+			GenericAlert (Stock.Information, primaryText, secondaryText, AlertButton.Ok);
 		}
 		#endregion
 		


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:27:35 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 08:27:35 -0400 (EDT)
Subject: [Mono-patches] r141035 - in
	trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl:
	. MonoDevelop.VersionControl
Message-ID: <20090901122735.125B49472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 08:27:34 -0400 (Tue, 01 Sep 2009)
New Revision: 141035

Modified:
   trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
   trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
Log:
* MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:
  Show an error message when trying to commit a directory which has no
  changes. Fixes bug #517699 - Monodevelop crash when submitting to
  SVN.

Modified: trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog	2009-09-01 12:26:30 UTC (rev 141034)
+++ trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog	2009-09-01 12:27:34 UTC (rev 141035)
@@ -1,3 +1,10 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.VersionControl/CommitCommand.cs: Show an error
+	  message when trying to commit a directory which has no
+	  changes. Fixes bug #517699 - Monodevelop crash when
+	  submitting to SVN.
+
 2009-08-27  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.VersionControl.Views/StatusView.cs: fixed

Modified: trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
--- trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs	2009-09-01 12:26:30 UTC (rev 141034)
+++ trunk/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs	2009-09-01 12:27:34 UTC (rev 141035)
@@ -23,7 +23,12 @@
 				foreach (VersionInfo vi in item.Repository.GetDirectoryVersionInfo (item.Path, false, true))
 					if (vi.HasLocalChanges)
 						cset.AddFile (vi);
-				Commit (item.Repository, cset, false);
+				if (!cset.IsEmpty) {
+					Commit (item.Repository, cset, false);
+				} else {
+					MessageService.ShowMessage (GettextCatalog.GetString ("There are no changes to be committed."));
+					return false;
+				}
 			}
 			return false;
 		}
@@ -31,6 +36,11 @@
 		public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
 		{
 			try {
+				if (changeSet.IsEmpty) {
+					if (!test)
+						MessageService.ShowMessage (GettextCatalog.GetString ("There are no changes to be committed."));
+					return false;
+				}
 				if (vc.CanCommit (changeSet.BaseLocalPath)) {
 					if (test) return true;
 


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:28:44 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 08:28:44 -0400 (EDT)
Subject: [Mono-patches] r141036 -
	trunk/mcs/class/System.ServiceModel/System.ServiceModel
Message-ID: <20090901122844.EBAA09472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 08:28:44 -0400 (Tue, 01 Sep 2009)
New Revision: 141036

Modified:
   trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
   trunk/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* ClientRuntimeChannel.cs : add Extensions.



Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog	2009-09-01 12:27:34 UTC (rev 141035)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog	2009-09-01 12:28:44 UTC (rev 141036)
@@ -1,3 +1,7 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* ClientRuntimeChannel.cs : add Extensions.
+
 2009-08-26  Atsushi Enomoto  <atsushi at ximian.com>
 
 	* SilverlightClientConfigLoader.cs : add (incomplete) binary

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs	2009-09-01 12:27:34 UTC (rev 141035)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs	2009-09-01 12:28:44 UTC (rev 141036)
@@ -383,9 +383,15 @@
 		}
 
 		// IExtensibleObject<IContextChannel>
-		[MonoTODO]
+
+		IExtensionCollection<IContextChannel> extensions;
+
 		public IExtensionCollection<IContextChannel> Extensions {
-			get { throw new NotImplementedException (); }
+			get {
+				if (extensions == null)
+					extensions = new ExtensionCollection<IContextChannel> (this);
+				return extensions;
+			}
 		}
 
 		#region Request/Output processing


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:31:27 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 08:31:27 -0400 (EDT)
Subject: [Mono-patches] r141037 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: . PyBinding.Parser.Dom
Message-ID: <20090901123127.88BF79472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 08:31:27 -0400 (Tue, 01 Sep 2009)
New Revision: 141037

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs
Log:
* PythonCompilationUnit.cs: Use proper package name and do not add
  class a second time.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:28:44 UTC (rev 141036)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:31:27 UTC (rev 141037)
@@ -1,5 +1,10 @@
 2009-09-01  Christian Hergert  <chris at dronelabs.com>
 
+	* PyBinding.Parser.Dom/PythonCompilationUnit.cs: Use proper
+	  package name and do not add class a second time.
+
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
 	* PyBinding.Gui.Navigation/PackageNodeBuilder.cs:
 	* PyBinding.Gui.Navigation/PackagesNodeBuilder.cs: Use
 	  "md-package" stock icon to be consistent.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs	2009-09-01 12:28:44 UTC (rev 141036)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs	2009-09-01 12:31:27 UTC (rev 141037)
@@ -53,7 +53,7 @@
 
 			// fake class containing modules funcs
 			var module = new PackageDomType () {
-				Name       = PythonHelper.ModuleFromFilename (FileName),
+				Name       = PythonHelper.PackageFromFilename (FileName),
 				ClassType  = ClassType.Unknown,
 				Location   = new DomLocation (0, 0),
 				BodyRegion = Module.Region,
@@ -86,7 +86,6 @@
 					Location      = new DomLocation (pyClass.Region.Start.Line - 1, 0),
 				};
 				m_AllWrapped.Add (domType);
-				Add (domType);
 
 				// class functions
 				foreach (IMethod method in BuildFunctions (pyClass.Functions))


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:33:12 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 08:33:12 -0400 (EDT)
Subject: [Mono-patches] r141038 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: .
	PyBinding.Gui.Navigation
Message-ID: <20090901123312.A1CF59472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 08:33:12 -0400 (Tue, 01 Sep 2009)
New Revision: 141038

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/ProjectNodeBuilderExtension.cs
Log:
* PackagesNodeBuilder.cs: Use the proper package name

* ProjectNodeBuilderExtension.cs: Just use the default ClassData
  builders for now.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:31:27 UTC (rev 141037)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:33:12 UTC (rev 141038)
@@ -1,5 +1,13 @@
 2009-09-01  Christian Hergert  <chris at dronelabs.com>
 
+	* PyBinding.Gui.Navigation/PackagesNodeBuilder.cs: Use the
+	  proper package name
+
+	* PyBinding.Gui.Navigation/ProjectNodeBuilderExtension.cs:
+	  Just use the default ClassData builders for now.
+
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
 	* PyBinding.Parser.Dom/PythonCompilationUnit.cs: Use proper
 	  package name and do not add class a second time.
 

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs	2009-09-01 12:31:27 UTC (rev 141037)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs	2009-09-01 12:33:12 UTC (rev 141038)
@@ -80,12 +80,20 @@
 			{
 				if (projectFile.BuildAction == BuildAction.Compile)
 				{
-					if (Path.GetExtension (projectFile.Name) == ".py")
+					if (Path.GetExtension (projectFile.Name).ToLower () == ".py")
 					{
-						treeBuilder.AddChild (new PackageNode () {
-							Name = PythonHelper.ModuleFromFilename (projectFile.Name),
-							ProjectFile = projectFile,
-						});
+						var name = PythonHelper.ModuleFromFilename (projectFile.Name);
+						
+						// It's only a module unless there is a "." in the name
+						// or its the __init__.py inside the package folder.
+						if (name.Contains (".") || Path.GetFileName (projectFile.Name).ToLower () == "__init__.py")
+						{
+							name = PythonHelper.PackageFromFilename (projectFile.Name);
+							treeBuilder.AddChild (new PackageNode () {
+								Name = name,
+								ProjectFile = projectFile,
+							});
+						}
 					}
 				}
 			}

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/ProjectNodeBuilderExtension.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/ProjectNodeBuilderExtension.cs	2009-09-01 12:31:27 UTC (rev 141037)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding.Gui.Navigation/ProjectNodeBuilderExtension.cs	2009-09-01 12:33:12 UTC (rev 141038)
@@ -48,14 +48,14 @@
 
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
-			PythonProject pyProject = dataObject as PythonProject;
-
-			if (pyProject == null)
-				return;
-
-			builder.AddChild (new PackagesNode () {
-				Project = pyProject
-			});
+//			PythonProject pyProject = dataObject as PythonProject;
+//
+//			if (pyProject == null)
+//				return;
+//
+//			builder.AddChild (new PackagesNode () {
+//				Project = pyProject
+//			});
 		}
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:34:20 2009
From: mono-patches-list at lists.ximian.com (Christian Hergert (chris@mosaix.net))
Date: Tue,  1 Sep 2009 08:34:20 -0400 (EDT)
Subject: [Mono-patches] r141039 - in
	trunk/monodevelop/extras/PyBinding/PyBinding: . PyBinding
Message-ID: <20090901123420.BB0319472C@mono-cvs.ximian.com>

Author: chergert
Date: 2009-09-01 08:34:20 -0400 (Tue, 01 Sep 2009)
New Revision: 141039

Modified:
   trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
   trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs
Log:
* PythonHelper.cs: Add helper to get python package name.

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:33:12 UTC (rev 141038)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/ChangeLog	2009-09-01 12:34:20 UTC (rev 141039)
@@ -1,5 +1,10 @@
 2009-09-01  Christian Hergert  <chris at dronelabs.com>
 
+	* PyBinding/PythonHelper.cs: Add helper to get python package
+	  name.
+
+2009-09-01  Christian Hergert  <chris at dronelabs.com>
+
 	* PyBinding.Gui.Navigation/PackagesNodeBuilder.cs: Use the
 	  proper package name
 

Modified: trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs
===================================================================
--- trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs	2009-09-01 12:33:12 UTC (rev 141038)
+++ trunk/monodevelop/extras/PyBinding/PyBinding/PyBinding/PythonHelper.cs	2009-09-01 12:34:20 UTC (rev 141039)
@@ -74,6 +74,14 @@
 
 			return m_ModuleCache[fileName];
 		}
+		
+		public static string PackageFromFilename (string fileName)
+		{
+			var modName = ModuleFromFilename (fileName);
+			if (modName.EndsWith (".__init__"))
+				return modName.Substring (0, modName.Length - 9);
+			return modName;
+		}
 
 		static string RecursiveModuleFromFile (DirectoryInfo dirInfo, string modName)
 		{


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:57:16 2009
From: mono-patches-list at lists.ximian.com (Sebastien Pouliot (sebastien@ximian.com))
Date: Tue,  1 Sep 2009 08:57:16 -0400 (EDT)
Subject: [Mono-patches] r141040 - trunk/moon/src
Message-ID: <20090901125716.530759472C@mono-cvs.ximian.com>

Author: spouliot
Date: 2009-09-01 08:57:15 -0400 (Tue, 01 Sep 2009)
New Revision: 141040

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/xaml.cpp
Log:
2009-09-01  Sebastien Pouliot  <sebastien at ximian.com>

	* xaml.cpp: Fix DRT355 (broken at r140756) to report the "right"
	error code when an invalid xap file is encoutered.

	re: jackson



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog	2009-09-01 12:34:20 UTC (rev 141039)
+++ trunk/moon/src/ChangeLog	2009-09-01 12:57:15 UTC (rev 141040)
@@ -1,3 +1,10 @@
+2009-09-01  Sebastien Pouliot  <sebastien at ximian.com>
+
+	* xaml.cpp: Fix DRT355 (broken at r140756) to report the "right"
+	error code when an invalid xap file is encoutered.
+
+	re: jackson
+
 2009-08-31  Sebastien Pouliot  <sebastien at ximian.com>
 
 	* debug.cpp: Delete frame if we're not using it in the loop

Modified: trunk/moon/src/xaml.cpp
===================================================================
--- trunk/moon/src/xaml.cpp	2009-09-01 12:34:20 UTC (rev 141039)
+++ trunk/moon/src/xaml.cpp	2009-09-01 12:57:15 UTC (rev 141040)
@@ -1595,6 +1595,9 @@
 	case XML_ERROR_NO_ELEMENTS:
 		parser_error (p, NULL, NULL, 7000, "unexpected end of input");
 		break;
+	case XML_ERROR_SYNTAX:
+		parser_error (p, NULL, NULL, 2103, "syntax error");
+		break;
 	default:
 		parser_error (p, NULL, NULL, expat_error, "Unhandled XML error %s", XML_ErrorString (expat_error));
 		break;


From mono-patches-list at lists.ximian.com  Tue Sep  1 08:57:25 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 08:57:25 -0400 (EDT)
Subject: [Mono-patches] r141041 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Formats.MSBuild
Message-ID: <20090901125725.EB6559472D@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 08:57:25 -0400 (Tue, 01 Sep 2009)
New Revision: 141041

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
Log:
* MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs: Use
  case insensitive compare when looking for project guids. Fixes bug
  #512459 - duplicated ProjectTypeGuids.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 12:57:15 UTC (rev 141040)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 12:57:25 UTC (rev 141041)
@@ -1,3 +1,9 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:
+	  Use case insensitive compare when looking for project guids.
+	  Fixes bug #512459 - duplicated ProjectTypeGuids.
+
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.Projects.Dom/CompilationUnit.cs: Check if built

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs	2009-09-01 12:57:15 UTC (rev 141040)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs	2009-09-01 12:57:25 UTC (rev 141041)
@@ -201,7 +201,7 @@
 			if (projectTypeGuids != null) {
 				foreach (string guid in projectTypeGuids.Split (';')) {
 					string sguid = guid.Trim ();
-					if (sguid.Length > 0 && sguid != TypeGuid)
+					if (sguid.Length > 0 && string.Compare (sguid, TypeGuid, true) != 0)
 						subtypeGuids.Add (guid);
 				}
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 09:08:32 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 09:08:32 -0400 (EDT)
Subject: [Mono-patches] r141042 -
	trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description
Message-ID: <20090901130832.ABC019472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 09:08:32 -0400 (Tue, 01 Sep 2009)
New Revision: 141042

Modified:
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientViaBehavior.cs
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* ClientCredentials.cs, ClientViaBehavior.cs,
	  MustUnderstandBehavior.cs : implement most of the methods.



Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog	2009-09-01 12:57:25 UTC (rev 141041)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog	2009-09-01 13:08:32 UTC (rev 141042)
@@ -1,3 +1,8 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* ClientCredentials.cs, ClientViaBehavior.cs,
+	  MustUnderstandBehavior.cs : implement most of the methods.
+
 2009-08-21  Atsushi Enomoto  <atsushi at ximian.com>
 
 	* ServiceMetadataExtension.cs:

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs	2009-09-01 12:57:25 UTC (rev 141041)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs	2009-09-01 13:08:32 UTC (rev 141042)
@@ -124,31 +124,33 @@
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
 		void IEndpointBehavior.AddBindingParameters (ServiceEndpoint endpoint,
 			BindingParameterCollection parameters)
 		{
 			parameters.Add (this);
 		}
 
-		[MonoTODO]
 		void IEndpointBehavior.ApplyDispatchBehavior (ServiceEndpoint endpoint,
 			EndpointDispatcher dispatcher)
 		{
-			throw new NotImplementedException ();
+			// documented as to have no effect.
 		}
 
 		[MonoTODO]
-		void IEndpointBehavior.ApplyClientBehavior (
+		public virtual void ApplyClientBehavior (
 			ServiceEndpoint endpoint, ClientRuntime behavior)
 		{
-			//throw new NotImplementedException ();
+			if (endpoint == null)
+				throw new ArgumentNullException ("endpoint");
+			if (behavior == null)
+				throw new ArgumentNullException ("behavior");
+
+			// FIXME: apply to endpoint when there is not security binding element.
 		}
 
-		[MonoTODO]
 		void IEndpointBehavior.Validate (ServiceEndpoint endpoint)
 		{
-			throw new NotImplementedException ();
+			// documented as reserved for future use.
 		}
 	}
 }

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientViaBehavior.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientViaBehavior.cs	2009-09-01 12:57:25 UTC (rev 141041)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientViaBehavior.cs	2009-09-01 13:08:32 UTC (rev 141042)
@@ -65,7 +65,7 @@
 
 		void IEndpointBehavior.Validate (ServiceEndpoint endpoint)
 		{
-			throw new NotImplementedException ();
+			// documented as not implemented (!?)
 		}
 	}
 }

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs	2009-09-01 12:57:25 UTC (rev 141041)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs	2009-09-01 13:08:32 UTC (rev 141042)
@@ -52,7 +52,7 @@
 		void IEndpointBehavior.ApplyDispatchBehavior (ServiceEndpoint endpoint,
 			EndpointDispatcher dispatcher)
 		{
-			throw new NotImplementedException ();
+			dispatcher.Runtime.ValidateMustUnderstand = validate;
 		}
 
 		void IEndpointBehavior.ApplyClientBehavior (ServiceEndpoint endpoint,
@@ -63,7 +63,6 @@
 
 		void IEndpointBehavior.Validate (ServiceEndpoint endpoint)
 		{
-			throw new NotImplementedException ();
 		}
 	}
 }
\ No newline at end of file


From mono-patches-list at lists.ximian.com  Tue Sep  1 09:09:00 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 09:09:00 -0400 (EDT)
Subject: [Mono-patches] r141043 -
	trunk/mcs/class/System.ServiceModel/System.ServiceModel
Message-ID: <20090901130900.6CEE49472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 09:09:00 -0400 (Tue, 01 Sep 2009)
New Revision: 141043

Modified:
   trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
   trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* ChannelFactory_1.cs : validate behaviors.



Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog	2009-09-01 13:08:32 UTC (rev 141042)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog	2009-09-01 13:09:00 UTC (rev 141043)
@@ -1,5 +1,9 @@
 2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
 
+	* ChannelFactory_1.cs : validate behaviors.
+
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
 	* ClientRuntimeChannel.cs : add Extensions.
 
 2009-08-26  Atsushi Enomoto  <atsushi at ximian.com>

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs	2009-09-01 13:08:32 UTC (rev 141042)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs	2009-09-01 13:09:00 UTC (rev 141043)
@@ -131,6 +131,7 @@
 		public virtual TChannel CreateChannel (EndpointAddress address, Uri via)
 		{
 			EnsureOpened ();
+			Endpoint.Validate ();
 			Type type = ClientProxyGenerator.CreateProxyType (typeof (TChannel), Endpoint.Contract, false);
 			// in .NET and SL2, it seems that the proxy is RealProxy.
 			// But since there is no remoting in SL2 (and we have


From mono-patches-list at lists.ximian.com  Tue Sep  1 09:11:17 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 09:11:17 -0400 (EDT)
Subject: [Mono-patches] r141044 - in trunk/mcs/class/System.ServiceModel.Web:
	System.ServiceModel.Description Test/System.ServiceModel.Web
Message-ID: <20090901131117.AA4F59472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 09:11:17 -0400 (Tue, 01 Sep 2009)
New Revision: 141044

Modified:
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
   trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
   trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog
   trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* WebHttpBehavior.cs : on validation, check wrapped parameter style.



Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog	2009-09-01 13:09:00 UTC (rev 141043)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog	2009-09-01 13:11:17 UTC (rev 141044)
@@ -1,3 +1,7 @@
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
+	* WebHttpBehavior.cs : on validation, check wrapped parameter style.
+
 2009-08-06  Atsushi Enomoto  <atsushi at ximian.com>
 
 	* WebScriptEnablingBehavior.cs : revert GetQueryStringConverter().

Modified: trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs	2009-09-01 13:09:00 UTC (rev 141043)
+++ trunk/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs	2009-09-01 13:11:17 UTC (rev 141044)
@@ -126,6 +126,27 @@
 		{
 			if (endpoint == null)
 				throw new ArgumentNullException ("endpoint");
+
+			foreach (var oper in endpoint.Contract.Operations)
+				foreach (var msg in oper.Messages)
+					switch (DefaultBodyStyle) {
+					case WebMessageBodyStyle.Wrapped:
+						continue;
+					case WebMessageBodyStyle.WrappedRequest:
+						if (msg.Direction == MessageDirection.Output)
+							continue;
+						goto case WebMessageBodyStyle.Bare;
+					case WebMessageBodyStyle.WrappedResponse:
+						if (msg.Direction == MessageDirection.Input)
+							continue;
+						goto case WebMessageBodyStyle.Bare;
+					case WebMessageBodyStyle.Bare:
+					default:
+						if (msg.Body.Parts.Count > 1)
+							throw new InvalidOperationException (String.Format ("{0} message on operation '{1}' has multiple parameters which is not allowed when the operation indicates no wrapper element. BodyStyle must be 'wrapped' on the operation WebInvoke/WebGet attribute.", msg.Direction, oper.Name));
+						break;
+					}
+
 			ValidateBinding (endpoint);
 		}
 

Modified: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog	2009-09-01 13:09:00 UTC (rev 141043)
+++ trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/ChangeLog	2009-09-01 13:11:17 UTC (rev 141044)
@@ -1,5 +1,9 @@
 2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
 
+	* WebInvokeAttributeTest.cs : enable the test with some fixes.
+
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
 	* WebOperationContextTest.cs : new test.
 	* WebInvokeAttributeTest.cs : new test, not working.
 

Modified: trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs	2009-09-01 13:09:00 UTC (rev 141043)
+++ trunk/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebInvokeAttributeTest.cs	2009-09-01 13:11:17 UTC (rev 141044)
@@ -57,11 +57,10 @@
 		}
 
 		[Test]
-		[Ignore ("seems not valid test yet")]
 		[ExpectedException (typeof (InvalidOperationException))]
 		public void RejectTwoParametersWhenNotWrapped ()
 		{
-			WebChannelFactory<IBogusService1>.CreateChannel (new WebHttpBinding (), new EndpointAddress ("http://localhost:37564"));
+			new WebChannelFactory<IBogusService1> (new WebHttpBinding (), new Uri ("http://localhost:37564")).CreateChannel ();
 		}
 
 		[ServiceContract]


From mono-patches-list at lists.ximian.com  Tue Sep  1 09:26:38 2009
From: mono-patches-list at lists.ximian.com (Marco Skambraks (marco@suse.de))
Date: Tue,  1 Sep 2009 09:26:38 -0400 (EDT)
Subject: [Mono-patches] r141045 - in trunk/uia2atk/test/keystrokes/winforms:
	. combobox_dropdownlist.py groupbox.py panel.py
Message-ID: <20090901132638.5588A9472C@mono-cvs.ximian.com>

Author: mskambraks
Date: 2009-09-01 09:26:38 -0400 (Tue, 01 Sep 2009)
New Revision: 141045

Modified:
   trunk/uia2atk/test/keystrokes/winforms/ChangeLog
   trunk/uia2atk/test/keystrokes/winforms/combobox_dropdownlist.py/combobox_dropdownlist.py
   trunk/uia2atk/test/keystrokes/winforms/groupbox.py/groupbox.py
   trunk/uia2atk/test/keystrokes/winforms/panel.py/panel.py
Log:
- updated some tests


Modified: trunk/uia2atk/test/keystrokes/winforms/ChangeLog
===================================================================
--- trunk/uia2atk/test/keystrokes/winforms/ChangeLog	2009-09-01 13:11:17 UTC (rev 141044)
+++ trunk/uia2atk/test/keystrokes/winforms/ChangeLog	2009-09-01 13:26:38 UTC (rev 141045)
@@ -1,4 +1,6 @@
 2009-08-28 Marco Skambraks <marco at suse.de>
+	* updated groupbox.py, panel.py and combobox_dropdownlist.py
+2009-08-28 Marco Skambraks <marco at suse.de>
 	* added toolbar.py
 
 2009-08-25 Marco Skambraks <marco at suse.de>

Modified: trunk/uia2atk/test/keystrokes/winforms/combobox_dropdownlist.py/combobox_dropdownlist.py
===================================================================
--- trunk/uia2atk/test/keystrokes/winforms/combobox_dropdownlist.py/combobox_dropdownlist.py	2009-09-01 13:11:17 UTC (rev 141044)
+++ trunk/uia2atk/test/keystrokes/winforms/combobox_dropdownlist.py/combobox_dropdownlist.py	2009-09-01 13:26:38 UTC (rev 141045)
@@ -30,7 +30,7 @@
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "control info (kp_enter)",
-    ["BRAILLE LINE:  '0'"
+    ["BRAILLE LINE:  '0'",
      "     VISIBLE:  '0', cursor=1",
      "SPEECH OUTPUT: 'combo box'",
      "SPEECH OUTPUT: '0'",

Modified: trunk/uia2atk/test/keystrokes/winforms/groupbox.py/groupbox.py
===================================================================
--- trunk/uia2atk/test/keystrokes/winforms/groupbox.py/groupbox.py	2009-09-01 13:11:17 UTC (rev 141044)
+++ trunk/uia2atk/test/keystrokes/winforms/groupbox.py/groupbox.py	2009-09-01 13:26:38 UTC (rev 141045)
@@ -23,6 +23,7 @@
     "switch focus to Button2",
     ["BRAILLE LINE:  'button2 Button'",
     "     VISIBLE:  'button2 Button', cursor=1",
+    "SPEECH OUTPUT: ''",
     "SPEECH OUTPUT: 'button2 button'"]))
 
 

Modified: trunk/uia2atk/test/keystrokes/winforms/panel.py/panel.py
===================================================================
--- trunk/uia2atk/test/keystrokes/winforms/panel.py/panel.py	2009-09-01 13:11:17 UTC (rev 141044)
+++ trunk/uia2atk/test/keystrokes/winforms/panel.py/panel.py	2009-09-01 13:26:38 UTC (rev 141045)
@@ -68,13 +68,9 @@
 sequence.append(WaitForFocus("Male", acc_role=pyatspi.ROLE_RADIO_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "focus on Male radiobutton",
-    ["BRAILLE LINE:  'Panel control Frame'",
-     "     VISIBLE:  'Panel control Frame', cursor=1",
-     "BRAILLE LINE:  '&=y Male RadioButton'",
+    ["BRAILLE LINE:  '&=y Male RadioButton'",
      "     VISIBLE:  '&=y Male RadioButton', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Panel control frame'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Male selected radio button'"]))
      
     


From mono-patches-list at lists.ximian.com  Tue Sep  1 09:42:09 2009
From: mono-patches-list at lists.ximian.com (Atsushi Enomoto (atsushi@ximian.com))
Date: Tue,  1 Sep 2009 09:42:09 -0400 (EDT)
Subject: [Mono-patches] r141046 -
	trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description
Message-ID: <20090901134209.0C2719472C@mono-cvs.ximian.com>

Author: atsushi
Date: 2009-09-01 09:42:08 -0400 (Tue, 01 Sep 2009)
New Revision: 141046

Modified:
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
   trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs
Log:
2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>

	* MustUnderstandBehavior.cs : fix build.



Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog	2009-09-01 13:26:38 UTC (rev 141045)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog	2009-09-01 13:42:08 UTC (rev 141046)
@@ -1,5 +1,9 @@
 2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
 
+	* MustUnderstandBehavior.cs : fix build.
+
+2009-09-01  Atsushi Enomoto  <atsushi at ximian.com>
+
 	* ClientCredentials.cs, ClientViaBehavior.cs,
 	  MustUnderstandBehavior.cs : implement most of the methods.
 

Modified: trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs
===================================================================
--- trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs	2009-09-01 13:26:38 UTC (rev 141045)
+++ trunk/mcs/class/System.ServiceModel/System.ServiceModel.Description/MustUnderstandBehavior.cs	2009-09-01 13:42:08 UTC (rev 141046)
@@ -52,7 +52,7 @@
 		void IEndpointBehavior.ApplyDispatchBehavior (ServiceEndpoint endpoint,
 			EndpointDispatcher dispatcher)
 		{
-			dispatcher.Runtime.ValidateMustUnderstand = validate;
+			dispatcher.DispatchRuntime.ValidateMustUnderstand = validate;
 		}
 
 		void IEndpointBehavior.ApplyClientBehavior (ServiceEndpoint endpoint,


From mono-patches-list at lists.ximian.com  Tue Sep  1 10:12:29 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 10:12:29 -0400 (EDT)
Subject: [Mono-patches] r141047 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects.Formats.MD1
Message-ID: <20090901141229.275FC9472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 10:12:28 -0400 (Tue, 01 Sep 2009)
New Revision: 141047

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs
Log:
* MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs: Fix
  bug #469211 - Satellite assembly names truncated when primary
  assembly name contains dot. Patch by Dean Brettle.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 13:42:08 UTC (rev 141046)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 14:12:28 UTC (rev 141047)
@@ -1,5 +1,11 @@
 2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
 
+	* MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:
+	  Fix bug #469211 - Satellite assembly names truncated when
+	  primary assembly name contains dot. Patch by Dean Brettle.
+
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
 	* MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:
 	  Use case insensitive compare when looking for project guids.
 	  Fixes bug #512459 - duplicated ProjectTypeGuids.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs	2009-09-01 13:42:08 UTC (rev 141046)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs	2009-09-01 14:12:28 UTC (rev 141047)
@@ -259,7 +259,7 @@
 			}
 
 			string al = configuration.TargetFramework.ClrVersion == ClrVersion.Net_2_0 ? "al2" : "al";
-			CompilerError err = GenerateSatelliteAssemblies (resourcesByCulture, configuration.OutputDirectory, al, Path.GetFileNameWithoutExtension (configuration.OutputAssembly), monitor);
+			CompilerError err = GenerateSatelliteAssemblies (resourcesByCulture, configuration.OutputDirectory, al, Path.GetFileName (configuration.OutputAssembly), monitor);
 			if (err != null) {
 				CompilerResults cr = new CompilerResults (new TempFileCollection ());
 				cr.Errors.Add (err);


From mono-patches-list at lists.ximian.com  Tue Sep  1 10:46:28 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 10:46:28 -0400 (EDT)
Subject: [Mono-patches] r141048 -
	trunk/monodevelop/main/src/addins/MonoDevelop.Autotools
Message-ID: <20090901144628.09C499472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 10:46:27 -0400 (Tue, 01 Sep 2009)
New Revision: 141048

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
Log:
* SimpleProjectMakefileHandler.cs: Include Content files to the list
  of files to deploy. Fixes bug #502111 - Generated tarballs do not
  include .desktop files.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog	2009-09-01 14:12:28 UTC (rev 141047)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog	2009-09-01 14:46:27 UTC (rev 141048)
@@ -1,3 +1,9 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* SimpleProjectMakefileHandler.cs: Include Content files to
+	  the list of files to deploy. Fixes bug #502111 - Generated
+	  tarballs do not include .desktop files.
+
 2009-08-26  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* gtk-gui/gui.stetic: Update gtk# dependency.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs	2009-09-01 14:12:28 UTC (rev 141047)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs	2009-09-01 14:46:27 UTC (rev 141048)
@@ -159,18 +159,19 @@
 					pfpath = FileService.NormalizeRelativePath (projectFile.RelativePath);
 					switch ( projectFile.BuildAction )
 					{
-						case "Compile":
+						case BuildAction.Compile:
 							
 							if ( projectFile.Subtype != Subtype.Code ) continue;
 							files.AppendFormat ( "\\\n\t{0} ", MakefileData.ToMakefilePath (pfpath));
 							break;
 
-						case "None":
+						case BuildAction.Content:
+						case BuildAction.None:
 
 							extraFiles.Add (MakefileData.ToMakefilePath (pfpath));
 							break;
 
-						case "EmbeddedResource":
+						case BuildAction.EmbeddedResource:
 
 							if ( !projectFile.FilePath.IsChildPathOf ( ctx.BaseDirectory ) )
 							{


From mono-patches-list at lists.ximian.com  Tue Sep  1 11:28:09 2009
From: mono-patches-list at lists.ximian.com (Jackson Harper (jackson@ximian.com))
Date: Tue,  1 Sep 2009 11:28:09 -0400 (EDT)
Subject: [Mono-patches] r141049 - in trunk/moon/test/2.0/moon-unit: .
	misc/Parsing
Message-ID: <20090901152809.160749472C@mono-cvs.ximian.com>

Author: jackson
Date: 2009-09-01 11:28:08 -0400 (Tue, 01 Sep 2009)
New Revision: 141049

Added:
   trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml
Modified:
   trunk/moon/test/2.0/moon-unit/ChangeLog
   trunk/moon/test/2.0/moon-unit/Makefile.am
   trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs
Log:

        * misc/Parsing/MiscParsing.cs:
        * misc/Parsing/MiscParsingPrivateControl.xaml: New tests for
        loading internal types.
        - Remove unused test for feature that doesnt work on SL



Modified: trunk/moon/test/2.0/moon-unit/ChangeLog
===================================================================
--- trunk/moon/test/2.0/moon-unit/ChangeLog	2009-09-01 14:46:27 UTC (rev 141048)
+++ trunk/moon/test/2.0/moon-unit/ChangeLog	2009-09-01 15:28:08 UTC (rev 141049)
@@ -1,3 +1,10 @@
+2009-09-01  Jackson Harper  <jackson at ximian.com>
+
+	* misc/Parsing/MiscParsing.cs:
+	* misc/Parsing/MiscParsingPrivateControl.xaml: New tests for
+	loading internal types.
+	- Remove unused test for feature that doesnt work on SL
+
 2009-08-31  Alan McGovern  <amcgovern at novell.com>
 
 	* System.Windows.Automation.Peers/SelectorItemAutomationPeerTest.cs:

Modified: trunk/moon/test/2.0/moon-unit/Makefile.am
===================================================================
--- trunk/moon/test/2.0/moon-unit/Makefile.am	2009-09-01 14:46:27 UTC (rev 141048)
+++ trunk/moon/test/2.0/moon-unit/Makefile.am	2009-09-01 15:28:08 UTC (rev 141049)
@@ -52,6 +52,7 @@
 	-res:misc/Parsing/MiscParsingCanvas.xaml,misc/Parsing/MiscParsingCanvas.xaml	\
 	-res:misc/Parsing/MiscParsingEvent.xaml,misc/Parsing/MiscParsingEvent.xaml	\
 	-res:misc/Parsing/MiscParsingManagedAttachedProp.xaml,misc/Parsing/MiscParsingManagedAttachedProp.xaml	\
+	-res:misc/Parsing/MiscParsingPrivateControl.xaml,misc/Parsing/MiscParsingPrivateControl.xaml	\
 	-res:misc/Parsing/MiscParsingTestPage.xaml,misc/Parsing/MiscParsingTestPage.xaml	\
 	-res:System.Windows/DependencyPropertyTest_ManagedTest_A1.xaml,System.Windows/DependencyPropertyTest_ManagedTest_A1.xaml	\
 	-res:System.Windows/DependencyPropertyTest_ManagedTest_A2.xaml,System.Windows/DependencyPropertyTest_ManagedTest_A2.xaml	\

Modified: trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs
===================================================================
--- trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs	2009-09-01 14:46:27 UTC (rev 141048)
+++ trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs	2009-09-01 15:28:08 UTC (rev 141049)
@@ -156,6 +156,18 @@
 		}
 	}
 
+	internal class ParsingPrivateControl : UserControl {
+		
+	}
+
+	public class ParsingPrivateControlWxClass : Canvas {
+
+		public ParsingPrivateControlWxClass ()
+		{
+			Application.LoadComponent (this, new Uri ("/moon-unit;component/misc/Parsing/MiscParsingPrivateControl.xaml", UriKind.Relative));
+		}
+	}
+
 	[TestClass]
 	public class MiscParsingTest : SilverlightTest
 	{
@@ -428,28 +440,17 @@
 		}
 
 		[TestMethod]
-		[MoonlightBug ("Multiple children for a setter value")]
-		public void MultipleChildrenOnSetterValue ()
+		public void PrivateType ()
 		{
-			var c = XamlReader.Load (@"<Canvas
-    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
-    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    Width=""400"" Height=""300"">
-    <Canvas.Resources>
-	<Style TargetType=""Canvas"" x:Key=""CanvasStyle"">
-	    <Setter Property=""Children"">
-		<Setter.Value>
-		    <Rectangle Width=""400"" Height=""300"" Fill=""Blue"" />
-                    <Rectangle Width=""300"" Height=""200"" Fill=""Green"" />
-		    <Rectangle Width=""200"" Height=""100"" Fill=""Red"" />
-		    <Rectangle Width=""100"" Height=""50"" Fill=""Yellow"" />
-		</Setter.Value>
-	    </Setter>
-	</Style>
-    </Canvas.Resources>
+			Assert.Throws<XamlParseException> (() => XamlReader.Load (@"<c:ParsingPrivateControl xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+							   	    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+								    xmlns:c=""clr-namespace:MoonTest.Misc.Parsing;assembly=moon-unit"">"));
+		}
 
-    <Canvas x:Name=""foo"" Style=""{StaticResource CanvasStyle}"" />
-</Canvas>");
+		[TestMethod]
+		public void PrivateTypeInXClass ()
+		{
+			Assert.Throws<XamlParseException> (() => new ParsingPrivateControlWxClass ());
 		}
 	}
 }

Added: trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml
===================================================================
--- trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml	                        (rev 0)
+++ trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml	2009-09-01 15:28:08 UTC (rev 141049)
@@ -0,0 +1,7 @@
+<UserControl x:Class="MoonTest.Misc.Parsing.MiscParsingPrivateControlWxClass"
+    	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+   	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:moon="clr-namespace:MoonTest.Misc.Parsing">
+
+</UserControl>
+


From mono-patches-list at lists.ximian.com  Tue Sep  1 11:35:32 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 11:35:32 -0400 (EDT)
Subject: [Mono-patches] r141050 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore: .
	MonoDevelop.GtkCore.NodeBuilders
Message-ID: <20090901153532.62DB49472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 11:35:32 -0400 (Tue, 01 Sep 2009)
New Revision: 141050

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
Log:
* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Store the
  GuiBuilderProject on which the ChangedEvent was subscribed, and use
  that reference when unsubscribing on Dispose. This is required
  because the GuiBuilderProject bound to a project may change. Fixes
  bug #525421 - Removing gtk-sharp reference from a project causes it
  to not function properly.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog	2009-09-01 15:28:08 UTC (rev 141049)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog	2009-09-01 15:35:32 UTC (rev 141050)
@@ -1,3 +1,12 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Store the
+	  GuiBuilderProject on which the ChangedEvent was subscribed,
+	  and use that reference when unsubscribing on Dispose. This
+	  is required because the GuiBuilderProject bound to a project
+	  may change. Fixes bug #525421 - Removing gtk-sharp reference
+	  from a project causes it to not function properly.
+
 2009-08-31  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* MonoDevelop.GtkCore.addin.xml: Don't use the text editor

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs	2009-09-01 15:28:08 UTC (rev 141049)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs	2009-09-01 15:35:32 UTC (rev 141050)
@@ -35,6 +35,7 @@
 	class WindowsFolder
 	{
 		Project project;
+		GuiBuilderProject gproject;
 		
 		public event EventHandler Changed;
 		
@@ -43,13 +44,13 @@
 			this.project = project;
 			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
 			
-			info.GuiBuilderProject.Changed += OnUpdateFiles;
+			gproject = info.GuiBuilderProject;
+			gproject.Changed += OnUpdateFiles;
 		}
 		
 		public void Dispose ()
 		{
-			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
-			info.GuiBuilderProject.Changed -= OnUpdateFiles;
+			gproject.Changed -= OnUpdateFiles;
 		}
 		
 		void OnUpdateFiles (object s, EventArgs args)


From mono-patches-list at lists.ximian.com  Tue Sep  1 11:36:32 2009
From: mono-patches-list at lists.ximian.com (Raja R Harinath (rharinath@novell.com))
Date: Tue,  1 Sep 2009 11:36:32 -0400 (EDT)
Subject: [Mono-patches] r141051 - in branches/mono-2-4-2/mcs/class/System:
	System Test/System
Message-ID: <20090901153632.9938B9472C@mono-cvs.ximian.com>

Author: raja
Date: 2009-09-01 11:36:32 -0400 (Tue, 01 Sep 2009)
New Revision: 141051

Modified:
   branches/mono-2-4-2/mcs/class/System/System/ChangeLog
   branches/mono-2-4-2/mcs/class/System/System/Uri.cs
   branches/mono-2-4-2/mcs/class/System/Test/System/ChangeLog
   branches/mono-2-4-2/mcs/class/System/Test/System/UriTest.cs
Log:
Fix #533572

* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.

2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
	* UriTest.cs: New tests from #533572.

(backported from trunk r141020)

Modified: branches/mono-2-4-2/mcs/class/System/System/ChangeLog
===================================================================
--- branches/mono-2-4-2/mcs/class/System/System/ChangeLog	2009-09-01 15:35:32 UTC (rev 141050)
+++ branches/mono-2-4-2/mcs/class/System/System/ChangeLog	2009-09-01 15:36:32 UTC (rev 141051)
@@ -1,3 +1,8 @@
+2009-09-01  Raja R Harinath  <harinath at hurrynot.org>
+
+	Fix #533572
+	* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.
+
 2009-01-28  Bill Holmes  <billholmes54 at gmail.com>
 
 	Backport of r124869.

Modified: branches/mono-2-4-2/mcs/class/System/System/Uri.cs
===================================================================
--- branches/mono-2-4-2/mcs/class/System/System/Uri.cs	2009-09-01 15:35:32 UTC (rev 141050)
+++ branches/mono-2-4-2/mcs/class/System/System/Uri.cs	2009-09-01 15:36:32 UTC (rev 141051)
@@ -1465,7 +1465,10 @@
 			}
 
 			// 4.a user info
-			pos = uriString.IndexOf ('@', startpos, endpos-startpos);
+			if (unixAbsPath)
+				pos = -1;
+			else
+				pos = uriString.IndexOf ('@', startpos, endpos-startpos);
 			if (pos != -1) {
 				userinfo = uriString.Substring (startpos, pos-startpos);
 				startpos = pos + 1;

Modified: branches/mono-2-4-2/mcs/class/System/Test/System/ChangeLog
===================================================================
--- branches/mono-2-4-2/mcs/class/System/Test/System/ChangeLog	2009-09-01 15:35:32 UTC (rev 141050)
+++ branches/mono-2-4-2/mcs/class/System/Test/System/ChangeLog	2009-09-01 15:36:32 UTC (rev 141051)
@@ -1,3 +1,7 @@
+2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
+
+	* UriTest.cs: New tests from #533572.
+
 2009-15-01  Leszek Ciesielski <skolima at gmail.com>
 
 	* UriTest3.cs: test for bug #464235

Modified: branches/mono-2-4-2/mcs/class/System/Test/System/UriTest.cs
===================================================================
--- branches/mono-2-4-2/mcs/class/System/Test/System/UriTest.cs	2009-09-01 15:35:32 UTC (rev 141050)
+++ branches/mono-2-4-2/mcs/class/System/Test/System/UriTest.cs	2009-09-01 15:36:32 UTC (rev 141051)
@@ -15,6 +15,9 @@
 using System.IO;
 using System.Text;
 
+// cheap hack to avoid backporting the new NUnit syntax patch
+using NAssert = NUnit.Framework.Assert;
+
 namespace MonoTests.System
 {
 	[TestFixture]
@@ -23,7 +26,7 @@
 		protected bool isWin32 = false;
 
 		[TestFixtureSetUp]
-		public void GetReady () 
+		public void GetReady ()
 		{
 			isWin32 = (Path.DirectorySeparatorChar == '\\');
 		}
@@ -45,21 +48,21 @@
 
 			uri = new Uri("http://[11:22:33::88]:9090");
 			Print (uri);
-			
+
 			uri = new Uri("http://[::127.11.22.33]:8080");
 			Print (uri);
-			
+
 			uri = new Uri("http://[abcde::127.11.22.33]:8080");
-			Print (uri);			
+			Print (uri);
 			*/
-			
+
 			/*
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar/");
 			Print (uri);
 
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar");
 			Print (uri);
-			
+
 			uri = new Uri ("http://www.contoso.com:1234/");
 			Print (uri);
 
@@ -480,7 +483,7 @@
 		{
 			new Uri ("http:a");
 		}
-		
+
 		[Test]
 		[ExpectedException (typeof (UriFormatException))]
 		public void HttpHostname3 ()
@@ -713,13 +716,13 @@
 			AssertEquals ("QE1", u1.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=/SearchDoc/Searcher.aspx");
 			AssertEquals ("QE2", u2.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx");
 		}
-		
+
 		[Test]
 		public void UnixPath () {
 			if (!isWin32)
 				AssertEquals ("#6a", "file:///cygwin/tmp/hello.txt", new Uri ("/cygwin/tmp/hello.txt").ToString ());
 		}
-		
+
 		[Test]
 		public void Unc ()
 		{
@@ -750,7 +753,7 @@
 		}
 
 		[Test]
-		public void FromHex () 
+		public void FromHex ()
 		{
 			AssertEquals ("#1", 0, Uri.FromHex ('0'));
 			AssertEquals ("#2", 9, Uri.FromHex ('9'));
@@ -801,7 +804,7 @@
 		}
 
 		[Test]
-		public void HexEscape () 
+		public void HexEscape ()
 		{
 			AssertEquals ("#1","%20", Uri.HexEscape (' ')); 
 			AssertEquals ("#2","%A9", Uri.HexEscape ((char) 0xa9)); 
@@ -822,7 +825,7 @@
         }
 
 		[Test]
-		public void HexUnescape () 
+		public void HexUnescape ()
 		{
 			int i = 0;
 			AssertEquals ("#1", ' ', Uri.HexUnescape ("%20", ref i));
@@ -853,7 +856,7 @@
 		[Category ("NotDotNet")]
 #endif
 		[Test]
-		public void HexUnescapeMultiByte () 
+		public void HexUnescapeMultiByte ()
 		{
 			// Tests from bug 74872
 			// Note: These won't pass exactly with MS.NET, due to differences in the
@@ -884,7 +887,7 @@
 		}
 
 		[Test]
-		public void IsHexDigit () 
+		public void IsHexDigit ()
 		{
 			Assert ("#1", Uri.IsHexDigit ('a'));	
 			Assert ("#2", Uri.IsHexDigit ('f'));
@@ -897,14 +900,14 @@
 		}
 
 		[Test]
-		public void IsHexEncoding () 
+		public void IsHexEncoding ()
 		{
 			Assert ("#1", Uri.IsHexEncoding ("test%a9test", 4));
 			Assert ("#2", !Uri.IsHexEncoding ("test%a9test", 3));
 			Assert ("#3", Uri.IsHexEncoding ("test%a9", 4));
 			Assert ("#4", !Uri.IsHexEncoding ("test%a", 4));
 		}
-		
+
 		[Test]
 		public void GetLeftPart ()
 		{
@@ -1059,7 +1062,7 @@
 			AssertEquals ("#46", UriHostNameType.Unknown, Uri.CheckHostName ("*.go-mono.com"));
 			AssertEquals ("#47", UriHostNameType.Unknown, Uri.CheckHostName ("www*.go-mono.com"));
 		}
-		
+
 		[Test]
 		public void IsLoopback ()
 		{
@@ -1191,7 +1194,7 @@
 		}
 
 		[Test]
-		public void GetHashCodeTest () 
+		public void GetHashCodeTest ()
 		{
 			Uri uri1 = new Uri ("http://www.contoso.com/index.htm#main");
 			Uri uri2 = new Uri ("http://www.contoso.com/index.htm#fragment");
@@ -1247,7 +1250,7 @@
 			Uri u = new Uri ("foo", UriKind.Relative);
 			u.GetLeftPart (UriPartial.Path);
 		}
-		
+
 		[Test]
 		public void TestPartialToString ()
 		{
@@ -1257,7 +1260,7 @@
 			AssertEquals ("#4", new Uri ("foo#dingus?aa", UriKind.Relative).ToString (), "foo#dingus?aa");
 			AssertEquals ("#4", new Uri ("foo?dingus#aa", UriKind.Relative).ToString (), "foo?dingus#aa");
 		}
-		
+
 		[Test]
 		public void RelativeGetHashCodeTest()
 		{
@@ -1612,7 +1615,7 @@
 		public void TestEscapeDataString ()
 		{
 			StringBuilder sb = new StringBuilder ();
-			
+
 			for (int i = 0; i < 128; i++)
 				sb.Append ((char) i);
 			
@@ -1647,7 +1650,7 @@
 		}
 
 		// This test doesn't work on Linux, and arguably shouldn't work.
-		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar" 
+		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar"
 		// on Linux, as anyone sane would expect.  It *doesn't* under .NET 1.1
 		// Apparently "tmp" is supposed to be a hostname (!)...
 		// Since "correct" behavior would confuse all Linux developers, and having
@@ -1680,7 +1683,7 @@
 
 		public static void Print (Uri uri)
 		{
-			Console.WriteLine ("ToString: " + uri.ToString ());	
+			Console.WriteLine ("ToString: " + uri.ToString ());
 
 			Console.WriteLine ("AbsolutePath: " + uri.AbsolutePath);
 			Console.WriteLine ("AbsoluteUri: " + uri.AbsoluteUri);
@@ -1702,12 +1705,126 @@
 
 			Console.WriteLine ("Segments:");
 			string [] segments = uri.Segments;
-			if (segments == null) 
+			if (segments == null)
 				Console.WriteLine ("\tNo Segments");
-			else 
-				for (int i = 0; i < segments.Length; i++) 
+			else
+				for (int i = 0; i < segments.Length; i++)
 					Console.WriteLine ("\t" + segments[i]);
 			Console.WriteLine ("");
 		}
+
+//BNC#533572
+#if NET_2_0
+		[Test]
+		public void LocalPath_FileNameWithAtSign1 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign2 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://user:password at thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, "user:password", "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign3 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, String.Empty, "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape(path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign4 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "localhost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsTrue (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			//this test is marked as NotWorking below:
+			//NAssert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void LocalPath_FileNameWithAtSign5 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")] // MS.NET seems not to like userinfo in a file:// uri...
+		[ExpectedException (typeof (UriFormatException))]
+		public void LocalPath_FileNameWithAtSign6 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://user:password at localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+		}
+
+
+		public class DerivedUri : Uri
+		{
+			public DerivedUri (string uriString) : base (uriString)
+			{
+			}
+
+			internal string TestUnescape (string path)
+			{
+				return base.Unescape (path);
+			}
+		}
+#endif
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 11:55:55 2009
From: mono-patches-list at lists.ximian.com (Raja R Harinath (rharinath@novell.com))
Date: Tue,  1 Sep 2009 11:55:55 -0400 (EDT)
Subject: [Mono-patches] r141052 - in branches/mono-2-4/mcs/class/System:
	System Test/System
Message-ID: <20090901155555.6A0629472C@mono-cvs.ximian.com>

Author: raja
Date: 2009-09-01 11:55:55 -0400 (Tue, 01 Sep 2009)
New Revision: 141052

Modified:
   branches/mono-2-4/mcs/class/System/System/ChangeLog
   branches/mono-2-4/mcs/class/System/System/Uri.cs
   branches/mono-2-4/mcs/class/System/Test/System/ChangeLog
   branches/mono-2-4/mcs/class/System/Test/System/UriTest.cs
Log:
Fix #533572

* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.

2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
	* UriTest.cs: New tests from #533572.

(backported from trunk r141020)

Modified: branches/mono-2-4/mcs/class/System/System/ChangeLog
===================================================================
--- branches/mono-2-4/mcs/class/System/System/ChangeLog	2009-09-01 15:36:32 UTC (rev 141051)
+++ branches/mono-2-4/mcs/class/System/System/ChangeLog	2009-09-01 15:55:55 UTC (rev 141052)
@@ -1,3 +1,8 @@
+2009-09-01  Raja R Harinath  <harinath at hurrynot.org>
+
+	Fix #533572
+	* Uri.cs (ParseNoExceptions): Don't look for '@' in absolute unix paths.
+
 2009-01-28  Bill Holmes  <billholmes54 at gmail.com>
 
 	Backport of r124869.

Modified: branches/mono-2-4/mcs/class/System/System/Uri.cs
===================================================================
--- branches/mono-2-4/mcs/class/System/System/Uri.cs	2009-09-01 15:36:32 UTC (rev 141051)
+++ branches/mono-2-4/mcs/class/System/System/Uri.cs	2009-09-01 15:55:55 UTC (rev 141052)
@@ -1465,7 +1465,10 @@
 			}
 
 			// 4.a user info
-			pos = uriString.IndexOf ('@', startpos, endpos-startpos);
+			if (unixAbsPath)
+				pos = -1;
+			else
+				pos = uriString.IndexOf ('@', startpos, endpos-startpos);
 			if (pos != -1) {
 				userinfo = uriString.Substring (startpos, pos-startpos);
 				startpos = pos + 1;

Modified: branches/mono-2-4/mcs/class/System/Test/System/ChangeLog
===================================================================
--- branches/mono-2-4/mcs/class/System/Test/System/ChangeLog	2009-09-01 15:36:32 UTC (rev 141051)
+++ branches/mono-2-4/mcs/class/System/Test/System/ChangeLog	2009-09-01 15:55:55 UTC (rev 141052)
@@ -1,3 +1,7 @@
+2009-09-01  Andres Aragoneses  <aaragoneses at novell.com>
+
+	* UriTest.cs: New tests from #533572.
+
 2009-15-01  Leszek Ciesielski <skolima at gmail.com>
 
 	* UriTest3.cs: test for bug #464235

Modified: branches/mono-2-4/mcs/class/System/Test/System/UriTest.cs
===================================================================
--- branches/mono-2-4/mcs/class/System/Test/System/UriTest.cs	2009-09-01 15:36:32 UTC (rev 141051)
+++ branches/mono-2-4/mcs/class/System/Test/System/UriTest.cs	2009-09-01 15:55:55 UTC (rev 141052)
@@ -15,6 +15,9 @@
 using System.IO;
 using System.Text;
 
+// cheap hack to avoid backporting the new NUnit syntax patch
+using NAssert = NUnit.Framework.Assert;
+
 namespace MonoTests.System
 {
 	[TestFixture]
@@ -23,7 +26,7 @@
 		protected bool isWin32 = false;
 
 		[TestFixtureSetUp]
-		public void GetReady () 
+		public void GetReady ()
 		{
 			isWin32 = (Path.DirectorySeparatorChar == '\\');
 		}
@@ -45,21 +48,21 @@
 
 			uri = new Uri("http://[11:22:33::88]:9090");
 			Print (uri);
-			
+
 			uri = new Uri("http://[::127.11.22.33]:8080");
 			Print (uri);
-			
+
 			uri = new Uri("http://[abcde::127.11.22.33]:8080");
-			Print (uri);			
+			Print (uri);
 			*/
-			
+
 			/*
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar/");
 			Print (uri);
 
 			uri = new Uri ("http://www.contoso.com:1234/foo/bar");
 			Print (uri);
-			
+
 			uri = new Uri ("http://www.contoso.com:1234/");
 			Print (uri);
 
@@ -480,7 +483,7 @@
 		{
 			new Uri ("http:a");
 		}
-		
+
 		[Test]
 		[ExpectedException (typeof (UriFormatException))]
 		public void HttpHostname3 ()
@@ -713,13 +716,13 @@
 			AssertEquals ("QE1", u1.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=/SearchDoc/Searcher.aspx");
 			AssertEquals ("QE2", u2.ToString (), "http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx");
 		}
-		
+
 		[Test]
 		public void UnixPath () {
 			if (!isWin32)
 				AssertEquals ("#6a", "file:///cygwin/tmp/hello.txt", new Uri ("/cygwin/tmp/hello.txt").ToString ());
 		}
-		
+
 		[Test]
 		public void Unc ()
 		{
@@ -750,7 +753,7 @@
 		}
 
 		[Test]
-		public void FromHex () 
+		public void FromHex ()
 		{
 			AssertEquals ("#1", 0, Uri.FromHex ('0'));
 			AssertEquals ("#2", 9, Uri.FromHex ('9'));
@@ -801,7 +804,7 @@
 		}
 
 		[Test]
-		public void HexEscape () 
+		public void HexEscape ()
 		{
 			AssertEquals ("#1","%20", Uri.HexEscape (' ')); 
 			AssertEquals ("#2","%A9", Uri.HexEscape ((char) 0xa9)); 
@@ -822,7 +825,7 @@
         }
 
 		[Test]
-		public void HexUnescape () 
+		public void HexUnescape ()
 		{
 			int i = 0;
 			AssertEquals ("#1", ' ', Uri.HexUnescape ("%20", ref i));
@@ -853,7 +856,7 @@
 		[Category ("NotDotNet")]
 #endif
 		[Test]
-		public void HexUnescapeMultiByte () 
+		public void HexUnescapeMultiByte ()
 		{
 			// Tests from bug 74872
 			// Note: These won't pass exactly with MS.NET, due to differences in the
@@ -884,7 +887,7 @@
 		}
 
 		[Test]
-		public void IsHexDigit () 
+		public void IsHexDigit ()
 		{
 			Assert ("#1", Uri.IsHexDigit ('a'));	
 			Assert ("#2", Uri.IsHexDigit ('f'));
@@ -897,14 +900,14 @@
 		}
 
 		[Test]
-		public void IsHexEncoding () 
+		public void IsHexEncoding ()
 		{
 			Assert ("#1", Uri.IsHexEncoding ("test%a9test", 4));
 			Assert ("#2", !Uri.IsHexEncoding ("test%a9test", 3));
 			Assert ("#3", Uri.IsHexEncoding ("test%a9", 4));
 			Assert ("#4", !Uri.IsHexEncoding ("test%a", 4));
 		}
-		
+
 		[Test]
 		public void GetLeftPart ()
 		{
@@ -1059,7 +1062,7 @@
 			AssertEquals ("#46", UriHostNameType.Unknown, Uri.CheckHostName ("*.go-mono.com"));
 			AssertEquals ("#47", UriHostNameType.Unknown, Uri.CheckHostName ("www*.go-mono.com"));
 		}
-		
+
 		[Test]
 		public void IsLoopback ()
 		{
@@ -1191,7 +1194,7 @@
 		}
 
 		[Test]
-		public void GetHashCodeTest () 
+		public void GetHashCodeTest ()
 		{
 			Uri uri1 = new Uri ("http://www.contoso.com/index.htm#main");
 			Uri uri2 = new Uri ("http://www.contoso.com/index.htm#fragment");
@@ -1247,7 +1250,7 @@
 			Uri u = new Uri ("foo", UriKind.Relative);
 			u.GetLeftPart (UriPartial.Path);
 		}
-		
+
 		[Test]
 		public void TestPartialToString ()
 		{
@@ -1257,7 +1260,7 @@
 			AssertEquals ("#4", new Uri ("foo#dingus?aa", UriKind.Relative).ToString (), "foo#dingus?aa");
 			AssertEquals ("#4", new Uri ("foo?dingus#aa", UriKind.Relative).ToString (), "foo?dingus#aa");
 		}
-		
+
 		[Test]
 		public void RelativeGetHashCodeTest()
 		{
@@ -1612,7 +1615,7 @@
 		public void TestEscapeDataString ()
 		{
 			StringBuilder sb = new StringBuilder ();
-			
+
 			for (int i = 0; i < 128; i++)
 				sb.Append ((char) i);
 			
@@ -1647,7 +1650,7 @@
 		}
 
 		// This test doesn't work on Linux, and arguably shouldn't work.
-		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar" 
+		// new Uri("file:///tmp/foo/bar").AbsolutePath returns "/tmp/foo/bar"
 		// on Linux, as anyone sane would expect.  It *doesn't* under .NET 1.1
 		// Apparently "tmp" is supposed to be a hostname (!)...
 		// Since "correct" behavior would confuse all Linux developers, and having
@@ -1680,7 +1683,7 @@
 
 		public static void Print (Uri uri)
 		{
-			Console.WriteLine ("ToString: " + uri.ToString ());	
+			Console.WriteLine ("ToString: " + uri.ToString ());
 
 			Console.WriteLine ("AbsolutePath: " + uri.AbsolutePath);
 			Console.WriteLine ("AbsoluteUri: " + uri.AbsoluteUri);
@@ -1702,12 +1705,126 @@
 
 			Console.WriteLine ("Segments:");
 			string [] segments = uri.Segments;
-			if (segments == null) 
+			if (segments == null)
 				Console.WriteLine ("\tNo Segments");
-			else 
-				for (int i = 0; i < segments.Length; i++) 
+			else
+				for (int i = 0; i < segments.Length; i++)
 					Console.WriteLine ("\t" + segments[i]);
 			Console.WriteLine ("");
 		}
+
+//BNC#533572
+#if NET_2_0
+		[Test]
+		public void LocalPath_FileNameWithAtSign1 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign2 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "http://user:password at thehost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, "user:password", "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "thehost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsFalse (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign3 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, String.Empty, "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsFalse (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape(path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			NAssert.AreEqual (path, fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		public void LocalPath_FileNameWithAtSign4 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual (fileUri.UserInfo, String.Empty, "LocalPath_FileNameWithAtSign UserInfo");
+			NAssert.AreEqual (fileUri.Host, "localhost", "LocalPath_FileNameWithAtSign Host");
+			NAssert.IsTrue (fileUri.IsFile, "LocalPath_FileNameWithAtSign IsFile");
+			NAssert.IsTrue (fileUri.IsAbsoluteUri, "LocalPath_FileNameWithAtSign IsAbsUri");
+			NAssert.IsTrue (fileUri.IsUnc, "LocalPath_FileNameWithAtSign IsUnc");
+
+			NAssert.AreEqual (fullpath, fileUri.OriginalString, "LocalPath_FileNameWithAtSign OriginalString");
+			NAssert.AreEqual (path, new DerivedUri (fullpath).TestUnescape (path), "LocalPath_FileNameWithAtSign ProtectedUnescape");
+			NAssert.AreEqual (path, fileUri.AbsolutePath, "LocalPath_FileNameWithAtSign AbsPath");
+			//this test is marked as NotWorking below:
+			//NAssert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void LocalPath_FileNameWithAtSign5 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+
+			NAssert.AreEqual ("\\\\localhost" + path.Replace ("/", "\\"), fileUri.LocalPath, "LocalPath_FileNameWithAtSign LocalPath");
+		}
+
+		[Test]
+		[Category ("NotWorking")] // MS.NET seems not to like userinfo in a file:// uri...
+		[ExpectedException (typeof (UriFormatException))]
+		public void LocalPath_FileNameWithAtSign6 ()
+		{
+			string path = "/some/path/file_with_an_ at _sign.mp3";
+			string fullpath = "file://user:password at localhost" + path;
+			Uri fileUri = new Uri (fullpath);
+		}
+
+
+		public class DerivedUri : Uri
+		{
+			public DerivedUri (string uriString) : base (uriString)
+			{
+			}
+
+			internal string TestUnescape (string path)
+			{
+				return base.Unescape (path);
+			}
+		}
+#endif
 	}
 }


From mono-patches-list at lists.ximian.com  Tue Sep  1 11:57:02 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 11:57:02 -0400 (EDT)
Subject: [Mono-patches] r141053 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Ide: .
	MonoDevelop.Ide.Gui
Message-ID: <20090901155702.2E6E69472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 11:57:01 -0400 (Tue, 01 Sep 2009)
New Revision: 141053

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
Log:
* MonoDevelop.Ide.Gui/Pad.cs: Always call activate on padwindow.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 15:55:55 UTC (rev 141052)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog	2009-09-01 15:57:01 UTC (rev 141053)
@@ -1,5 +1,10 @@
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
+	* MonoDevelop.Ide.Gui/Pad.cs: Always call activate on
+	  padwindow.
+
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
 	* MonoDevelop.Ide.Gui/Pad.cs:
 	* MonoDevelop.Ide.Gui/Workbench.cs:
 	* MonoDevelop.Ide.Gui/IPadContainer.cs:

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs	2009-09-01 15:55:55 UTC (rev 141052)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs	2009-09-01 15:57:01 UTC (rev 141053)
@@ -93,10 +93,8 @@
 		public void BringToFront (bool grabFocus)
 		{
 			PadWindow.LastActivePadWindow = window;
-			// TODO: Is bringToFront really required, or is Activate (grabFocus) enough ?
 			workbench.BringToFront (content);
-			if (grabFocus)
-				window.Activate (grabFocus);
+			window.Activate (grabFocus);
 		}
 		
 		public bool Visible {


From mono-patches-list at lists.ximian.com  Tue Sep  1 13:10:28 2009
From: mono-patches-list at lists.ximian.com (Mike Krüger (mkrueger@novell.com))
Date: Tue,  1 Sep 2009 13:10:28 -0400 (EDT)
Subject: [Mono-patches] r141054 -
	trunk/monodevelop/main/src/core/MonoDevelop.Dock
Message-ID: <20090901171028.26D979472C@mono-cvs.ximian.com>

Author: mkrueger
Date: 2009-09-01 13:10:28 -0400 (Tue, 01 Sep 2009)
New Revision: 141054

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs
Log:
* DockItem.cs: If the DockItem status is AutoHide always give focus
  on Present (bool giveFocus).

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog	2009-09-01 15:57:01 UTC (rev 141053)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Dock/ChangeLog	2009-09-01 17:10:28 UTC (rev 141054)
@@ -1,3 +1,8 @@
+2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
+
+	* DockItem.cs: If the DockItem status is AutoHide always give
+	  focus on Present (bool giveFocus).
+
 2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* DockItem.cs: Fire the ContentRequired event only when the

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs	2009-09-01 15:57:01 UTC (rev 141053)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Dock/DockItem.cs	2009-09-01 17:10:28 UTC (rev 141054)
@@ -238,9 +238,9 @@
 		public void Present (bool giveFocus)
 		{
 			if (dockBarItem != null)
-				dockBarItem.Present (giveFocus);
+				dockBarItem.Present (Status == DockItemStatus.AutoHide || giveFocus);
 			else
-				frame.Present (this, giveFocus);
+				frame.Present (this, Status == DockItemStatus.AutoHide || giveFocus);
 		}
 
 		public bool ContentVisible {


From mono-patches-list at lists.ximian.com  Tue Sep  1 13:11:27 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 13:11:27 -0400 (EDT)
Subject: [Mono-patches] r141055 - in
	trunk/monodevelop/main/src/core/MonoDevelop.Projects: .
	MonoDevelop.Projects
Message-ID: <20090901171127.353BA9472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 13:11:27 -0400 (Tue, 01 Sep 2009)
New Revision: 141055

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
   trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildResult.cs
Log:
* MonoDevelop.Projects/BuildResult.cs: Update the failedBuildCount
  when adding errors.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 17:10:28 UTC (rev 141054)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog	2009-09-01 17:11:27 UTC (rev 141055)
@@ -1,5 +1,10 @@
 2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
 
+	* MonoDevelop.Projects/BuildResult.cs: Update the
+	  failedBuildCount when adding errors.
+
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
 	* MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs:
 	  Fix bug #469211 - Satellite assembly names truncated when
 	  primary assembly name contains dot. Patch by Dean Brettle.

Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildResult.cs
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildResult.cs	2009-09-01 17:10:28 UTC (rev 141054)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildResult.cs	2009-09-01 17:11:27 UTC (rev 141055)
@@ -62,7 +62,6 @@
 				foreach (CompilerError err in compilerResults.Errors) {
 					Append (new BuildError (err));
 				}
-				if (errorCount > 0) failedBuildCount = 1;
 			}
 		}
 		
@@ -134,8 +133,11 @@
 				error.SourceTarget = sourceTarget;
 			if (error.IsWarning)
 				warningCount++;
-			else
+			else {
 				errorCount++;
+				if (failedBuildCount == 0)
+					failedBuildCount = 1;
+			}
 			return this;
 		}
 


From mono-patches-list at lists.ximian.com  Tue Sep  1 13:28:54 2009
From: mono-patches-list at lists.ximian.com (Jackson Harper (jackson@ximian.com))
Date: Tue,  1 Sep 2009 13:28:54 -0400 (EDT)
Subject: [Mono-patches] r141056 - trunk/moon/test/2.0/moon-unit/misc/Parsing
Message-ID: <20090901172854.5D2359472C@mono-cvs.ximian.com>

Author: jackson
Date: 2009-09-01 13:28:54 -0400 (Tue, 01 Sep 2009)
New Revision: 141056

Modified:
   trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs
   trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml
Log:

        Fix test.



Modified: trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs
===================================================================
--- trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs	2009-09-01 17:11:27 UTC (rev 141055)
+++ trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsing.cs	2009-09-01 17:28:54 UTC (rev 141056)
@@ -160,12 +160,16 @@
 		
 	}
 
-	public class ParsingPrivateControlWxClass : Canvas {
+	internal class ParsingPrivateControlWxClass : UserControl {
 
 		public ParsingPrivateControlWxClass ()
 		{
 			Application.LoadComponent (this, new Uri ("/moon-unit;component/misc/Parsing/MiscParsingPrivateControl.xaml", UriKind.Relative));
 		}
+
+		public UIElement TheContent {
+			get { return Content; }
+		}
 	}
 
 	[TestClass]
@@ -450,7 +454,10 @@
 		[TestMethod]
 		public void PrivateTypeInXClass ()
 		{
-			Assert.Throws<XamlParseException> (() => new ParsingPrivateControlWxClass ());
+			var c = new ParsingPrivateControlWxClass ();
+
+			Assert.IsNotNull (c.TheContent, "1");
+			Assert.AreEqual (typeof (Border), c.TheContent.GetType (), "2");
 		}
 	}
 }

Modified: trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml
===================================================================
--- trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml	2009-09-01 17:11:27 UTC (rev 141055)
+++ trunk/moon/test/2.0/moon-unit/misc/Parsing/MiscParsingPrivateControl.xaml	2009-09-01 17:28:54 UTC (rev 141056)
@@ -1,7 +1,9 @@
-<UserControl x:Class="MoonTest.Misc.Parsing.MiscParsingPrivateControlWxClass"
+<UserControl x:Class="MoonTest.Misc.Parsing.ParsingPrivateControlWxClass"
     	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
    	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:moon="clr-namespace:MoonTest.Misc.Parsing">
 
+	<Border />
+
 </UserControl>
 


From mono-patches-list at lists.ximian.com  Tue Sep  1 13:51:18 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 13:51:18 -0400 (EDT)
Subject: [Mono-patches] r141057 - in trunk/monodevelop/main/src/addins:
	AspNet/MonoDevelop.AspNet MonoDevelop.Refactoring
Message-ID: <20090901175118.BB3009472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 13:51:18 -0400 (Tue, 01 Sep 2009)
New Revision: 141057

Modified:
   trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/ChangeLog
   trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
Log:
* src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj:
Don't require a specific version for Mono.Addins.

Modified: trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/ChangeLog	2009-09-01 17:28:54 UTC (rev 141056)
+++ trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/ChangeLog	2009-09-01 17:51:18 UTC (rev 141057)
@@ -1,3 +1,8 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.AspNet.csproj: Don't require a specific version
+	  for Mono.Addins.
+
 2009-08-26  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* gtk-gui/gui.stetic: Update gtk# dependency.

Modified: trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
===================================================================
--- trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj	2009-09-01 17:28:54 UTC (rev 141056)
+++ trunk/monodevelop/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj	2009-09-01 17:51:18 UTC (rev 141057)
@@ -121,7 +121,9 @@
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.AspNet.addin.xml" />

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 17:28:54 UTC (rev 141056)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/ChangeLog	2009-09-01 17:51:18 UTC (rev 141057)
@@ -1,3 +1,8 @@
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* MonoDevelop.Refactoring.csproj: Don't require a specific
+	  version for Mono.Addins.
+
 2009-09-01  Mike Kr?ger  <mkrueger at novell.com>
 
 	* MonoDevelop.Refactoring/RefactoryCommands.cs:

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj	2009-09-01 17:28:54 UTC (rev 141056)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj	2009-09-01 17:51:18 UTC (rev 141057)
@@ -36,7 +36,9 @@
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>


From mono-patches-list at lists.ximian.com  Tue Sep  1 14:09:42 2009
From: mono-patches-list at lists.ximian.com (Lluis Sanchez (lluis@ximian.com))
Date: Tue,  1 Sep 2009 14:09:42 -0400 (EDT)
Subject: [Mono-patches] r141058 - in
	trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore: .
	MonoDevelop.GtkCore
Message-ID: <20090901180942.01BCC9472C@mono-cvs.ximian.com>

Author: lluis
Date: 2009-09-01 14:09:42 -0400 (Tue, 01 Sep 2009)
New Revision: 141058

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog
   trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
Log:
* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Use real resource
  Ids instead of file names. Fixes bug #528309 - Button Icons are not
  displayed.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog	2009-09-01 17:51:18 UTC (rev 141057)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/ChangeLog	2009-09-01 18:09:42 UTC (rev 141058)
@@ -1,5 +1,11 @@
 2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
 
+	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Use real
+	  resource Ids instead of file names. Fixes bug #528309 -
+	  Button Icons are not displayed.
+
+2009-09-01  Lluis Sanchez Gual  <lluis at novell.com>
+
 	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Store the
 	  GuiBuilderProject on which the ChangedEvent was subscribed,
 	  and use that reference when unsubscribing on Dispose. This

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs	2009-09-01 17:51:18 UTC (rev 141057)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs	2009-09-01 18:09:42 UTC (rev 141058)
@@ -47,7 +47,7 @@
 			ArrayList list = new ArrayList ();
 			foreach (ProjectFile file in project.Files) {
 				if (file.BuildAction == BuildAction.EmbeddedResource)
-					list.Add (new Stetic.ResourceInfo (Path.GetFileName (file.Name), file.Name, MonoDevelop.Core.Gui.DesktopService.GetMimeTypeForUri (file.Name)));
+					list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, MonoDevelop.Core.Gui.DesktopService.GetMimeTypeForUri (file.Name)));
 			}
 			return (Stetic.ResourceInfo[]) list.ToArray (typeof(Stetic.ResourceInfo));
 		}
@@ -55,7 +55,7 @@
 		public Stream GetResourceStream (string resourceName)
 		{
 			foreach (ProjectFile file in project.Files) {
-				if (resourceName == Path.GetFileName (file.Name))
+				if (resourceName == file.ResourceId)
 					return File.OpenRead (file.Name);
 			}
 			return null;
@@ -63,17 +63,17 @@
 		
 		public Stetic.ResourceInfo AddResource (string fileName)
 		{
-			project.AddFile (fileName, BuildAction.EmbeddedResource);
-			project.Save (new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor());
-			return new Stetic.ResourceInfo (Path.GetFileName (fileName), fileName);
+			ProjectFile file = project.AddFile (fileName, BuildAction.EmbeddedResource);
+			MonoDevelop.Ide.Gui.IdeApp.ProjectOperations.Save (project);
+			return new Stetic.ResourceInfo (file.ResourceId, fileName);
 		}
 		
 		public void RemoveResource (string resourceName)
 		{
 			foreach (ProjectFile file in project.Files) {
-				if (resourceName == Path.GetFileName (file.Name)) {
+				if (resourceName == file.ResourceId) {
 					project.Files.Remove (file);
-					project.Save (new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor());
+					MonoDevelop.Ide.Gui.IdeApp.ProjectOperations.Save (project);
 					return;
 				}
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 14:32:56 2009
From: mono-patches-list at lists.ximian.com (Larry Ewing (lewing@ximian.com))
Date: Tue,  1 Sep 2009 14:32:56 -0400 (EDT)
Subject: [Mono-patches] r141059 - trunk/moon/src
Message-ID: <20090901183256.980789472C@mono-cvs.ximian.com>

Author: lewing
Date: 2009-09-01 14:32:56 -0400 (Tue, 01 Sep 2009)
New Revision: 141059

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/frameworkelement.cpp
Log:
2009-09-01  Larry Ewing  <lewing at novell.com>

	* frameworkelement.cpp: clear LastRenderSize before we emit so
	that we don't end up in a possible recursion.

	Fixes http://www.worldwidetelescope.org/webclient/

	r: toshok

Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog	2009-09-01 18:09:42 UTC (rev 141058)
+++ trunk/moon/src/ChangeLog	2009-09-01 18:32:56 UTC (rev 141059)
@@ -1,3 +1,12 @@
+2009-09-01  Larry Ewing  <lewing at novell.com>
+
+	* frameworkelement.cpp: clear LastRenderSize before we emit so
+	that we don't end up in a possible recursion.
+
+	Fixes http://www.worldwidetelescope.org/webclient/
+	
+	r: toshok
+
 2009-09-01  Sebastien Pouliot  <sebastien at ximian.com>
 
 	* xaml.cpp: Fix DRT355 (broken at r140756) to report the "right"

Modified: trunk/moon/src/frameworkelement.cpp
===================================================================
--- trunk/moon/src/frameworkelement.cpp	2009-09-01 18:09:42 UTC (rev 141058)
+++ trunk/moon/src/frameworkelement.cpp	2009-09-01 18:32:56 UTC (rev 141059)
@@ -839,10 +839,12 @@
 				FrameworkElement *fe = (FrameworkElement*) node->uielement;
 
 				updated = true;
-				SizeChangedEventArgs *args = new SizeChangedEventArgs (*LayoutInformation::GetLastRenderSize (fe), fe->GetRenderSize ());
-				fe->Emit (FrameworkElement::SizeChangedEvent, args);
-				fe->ClearValue (LayoutInformation::LastRenderSizeProperty, false);
-				
+				Size *last = LayoutInformation::GetLastRenderSize (fe);
+				if (last) {
+					SizeChangedEventArgs *args = new SizeChangedEventArgs (*last, fe->GetRenderSize ());
+					fe->ClearValue (LayoutInformation::LastRenderSizeProperty, false);
+					fe->Emit (FrameworkElement::SizeChangedEvent, args);
+				}
 				delete (node);
 			}
 		} else if (!updated_list->IsEmpty ()) {


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:01:26 2009
From: mono-patches-list at lists.ximian.com (Andrew Jorgensen (ajorgensen@novell.com)
Date: Tue,  1 Sep 2009 15:01:26 -0400 (EDT)
Subject: [Mono-patches] r141060 - trunk/release/packaging/rpm_defs/mono-core
Message-ID: <20090901190126.C4C659472C@mono-cvs.ximian.com>

Author: ajorg
Date: 2009-09-01 15:01:26 -0400 (Tue, 01 Sep 2009)
New Revision: 141060

Modified:
   trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
Log:
xbuild manpage

Modified: trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-core.spec	2009-09-01 18:32:56 UTC (rev 141059)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec	2009-09-01 19:01:26 UTC (rev 141060)
@@ -1000,6 +1000,7 @@
 %_mandir/man1/al.1%ext_man
 %_mandir/man1/mono-xmltool.1%ext_man
 %_mandir/man1/resgen.1%ext_man
+%_mandir/man1/xbuild.1%ext_man
 # Shell wrappers
 %_bindir/al
 %_bindir/al1


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:22:47 2009
From: mono-patches-list at lists.ximian.com (Jackson Harper (jackson@ximian.com))
Date: Tue,  1 Sep 2009 15:22:47 -0400 (EDT)
Subject: [Mono-patches] r141061 - trunk/moon/class/System.Windows/Mono
Message-ID: <20090901192247.9BD1C9472C@mono-cvs.ximian.com>

Author: jackson
Date: 2009-09-01 15:22:47 -0400 (Tue, 01 Sep 2009)
New Revision: 141061

Modified:
   trunk/moon/class/System.Windows/Mono/ChangeLog
   trunk/moon/class/System.Windows/Mono/ManagedXamlLoader.cs
Log:

        * ManagedXamlLoader.cs (ManagedXamlLoader.LookupType): rework
        this pretty substantially.  If we're given an assembly name, load
        that assembly and look up the type there.  If we're only given the
        type name, we need to iterate over the assemblies that the deployment
        contains, looking for them there.
    
        A slightly more controversial is that apparently it's valid to do
        this: <UserControl x:Class="Some.Type"/> where Some.Type is
        private.
    
        http://www.propserv.otago.ac.nz/imap/ makes use of both of these
        features. The private type it loads is
        Microsoft.VirtualEarth.MapControl.Core.DragRectangle, which is
        defined thusly:
    
        .class private auto ansi beforefieldinit DragRectangle
                extends
        [System.Windows]System.Windows.Controls.UserControl

        jackson - We restrict these private lookups to lookup only, it is
        illegal to create an internal type in the parser, it only works
        while hydrating because the type is already created.

        r: jackson/toshok



Modified: trunk/moon/class/System.Windows/Mono/ChangeLog
===================================================================
--- trunk/moon/class/System.Windows/Mono/ChangeLog	2009-09-01 19:01:26 UTC (rev 141060)
+++ trunk/moon/class/System.Windows/Mono/ChangeLog	2009-09-01 19:22:47 UTC (rev 141061)
@@ -1,3 +1,30 @@
+2009-08-27  Chris Toshok  <toshok at ximian.com>
+    
+    	* ManagedXamlLoader.cs (ManagedXamlLoader.LookupType): rework this
+    	pretty substantially.  If we're given an assembly name, load that
+    	assembly and look up the type there.  If we're only given the type
+    	name, we need to iterate over the assemblies that the deployment
+    	contains, looking for them there.
+    
+    	A slightly more controversial is that apparently it's valid to do
+    	this: <UserControl x:Class="Some.Type"/> where Some.Type is
+    	private.
+    
+    	http://www.propserv.otago.ac.nz/imap/ makes use of both of these
+    	features. The private type it loads is
+    	Microsoft.VirtualEarth.MapControl.Core.DragRectangle, which is
+    	defined thusly:
+    
+    	.class private auto ansi beforefieldinit DragRectangle
+                extends
+	[System.Windows]System.Windows.Controls.UserControl
+
+	jackson - We restrict these private lookups to lookup only, it is
+	illegal to create an internal type in the parser, it only works
+	while hydrating because the type is already created.
+
+	r: jackson/toshok
+
 2009-08-26  Alan McGovern  <amcgovern at novell.com>
 
 	* GeneratedPInvokes.cs: Allow FrameworkTemplates to be

Modified: trunk/moon/class/System.Windows/Mono/ManagedXamlLoader.cs
===================================================================
--- trunk/moon/class/System.Windows/Mono/ManagedXamlLoader.cs	2009-09-01 19:01:26 UTC (rev 141060)
+++ trunk/moon/class/System.Windows/Mono/ManagedXamlLoader.cs	2009-09-01 19:22:47 UTC (rev 141061)
@@ -203,6 +203,12 @@
 			}
 
 			if (create) {
+
+				if (!type.IsPublic) {
+					value = Value.Empty;
+					throw new XamlParseException ("Attempting to create a private type");
+				}
+
 				object res = null;
 				try {
 					res = Activator.CreateInstance (type);
@@ -975,45 +981,44 @@
 		private unsafe Type LookupType (Value* top_level, string assembly_name, string full_name)
 		{
 			Type res = null;
-			bool explicit_assembly = assembly_name != null;
 
-			do {
-				if (assembly_name == null && !TryGetDefaultAssemblyName (top_level, out assembly_name)) {
-					Console.Error.WriteLine ("unable to find the assembly name for the target type.");
-					break;
-				}
+			if (assembly_name != null) {
 
+				// if we're given an explicit assembly
+				// name, try and load it, then get the
+				// type from just that assembly
+
 				Assembly assembly = null;
-				if (LoadAssembly (assembly_name, out assembly) != AssemblyLoadResult.Success) {
+				if (LoadAssembly (assembly_name, out assembly) == AssemblyLoadResult.Success) {
+					res = assembly.GetType (full_name);
+					if (res != null)
+						return res;
+				}
+				else {
 					Console.Error.WriteLine ("unable to load assembly for target type.");
-					break;
 				}
+			}
+			else {
 
-				res = assembly.GetType (full_name);
-				if (res == null && explicit_assembly && TryGetDefaultAssemblyName (top_level, out assembly_name)) {
-					if (LoadAssembly (assembly_name, out assembly) != AssemblyLoadResult.Success) {
-						Console.Error.WriteLine ("unable to load default assembly for target type.");
-						break;
-					}
-					res = assembly.GetType (full_name);
+				// if we're not given an explicit
+				// assembly name, loop over all
+				// assemblies specified in
+				// Deployment.Parts looking for the
+				// type.
+				foreach (Assembly a in Deployment.Current.Assemblies) {
+					res = a.GetType (full_name);
 					if (res != null)
-						Console.Error.WriteLine ("type:  {0}  base:  {1}", res, res.BaseType);
-					if (res != null && !res.IsPublic)
-						res = null;
+						return res;
 				}
 
-				if (res == null && !explicit_assembly) {
-					assembly = typeof (DependencyObject).Assembly;
-					res = assembly.GetType (full_name);
-					if (res != null && !res.IsPublic)
-						res = null;
-				}
-			} while (false);
+				Assembly assembly = typeof (DependencyObject).Assembly;
+				res = assembly.GetType (full_name);
+				if (res != null && res.IsPublic)
+					return res;
 
-			if (res == null)
-				res = Application.GetComponentTypeFromName (full_name);
+			}
 
-			return res;
+			return Application.GetComponentTypeFromName (full_name);
 		}
 
 		private unsafe void SetCLRPropertyFromString (XamlCallbackData *data, IntPtr target_data, object target, PropertyInfo pi, string value, out string error, out IntPtr unmanaged_value)


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:24:41 2009
From: mono-patches-list at lists.ximian.com (Marek Habersack (grendello@gmail.com))
Date: Tue,  1 Sep 2009 15:24:41 -0400 (EDT)
Subject: [Mono-patches] r141062 - in trunk/mcs/class:
	System.Web/System.Web.UI.WebControls System.Web.Extensions
	System.Web.Extensions/System.Web.UI.WebControls
Message-ID: <20090901192441.4F7C99472C@mono-cvs.ximian.com>

Author: mhabersack
Date: 2009-09-01 15:24:40 -0400 (Tue, 01 Sep 2009)
New Revision: 141062

Modified:
   trunk/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
   trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
Log:
2009-09-01  Marek Habersack  <mhabersack at novell.com>

	* ListView.cs: LoadControlState must call OnTotalRowCountAvailable
	after restoring the state, so that all parties subscribed to that
	event are given chance to react accordingly.
	SetPageProperties should use values stored in
	PagePropertiesChangingEventArgs arguments after handler returns.

2009-09-01  Marek Habersack  <mhabersack at novell.com>

	* ObjectDataSourceView.cs: ExecuteSelect must call
	QueryTotalRowCount after executing the select method (that's what
	.NET does)

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:22:47 UTC (rev 141061)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:24:40 UTC (rev 141062)
@@ -1,3 +1,9 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ObjectDataSourceView.cs: ExecuteSelect must call
+	QueryTotalRowCount after executing the select method (that's what
+	.NET does)
+
 2009-08-25  Marek Habersack  <mhabersack at novell.com>
 
 	* WebColorConverter.cs: inform the user that the might need to

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:22:47 UTC (rev 141061)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:24:40 UTC (rev 141062)
@@ -713,10 +713,7 @@
 				OnSelecting (args);
 				if (args.Cancel)
 					return new ArrayList ();
-
-				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
-					arguments.TotalRowCount = QueryTotalRowCount (paramValues, arguments);
-
+				
 				if (CanPage) {
 					if (StartRowIndexParameterName.Length == 0)
 						throw new InvalidOperationException ("Paging is enabled, but the StartRowIndexParameterName property is not set.");
@@ -731,6 +728,9 @@
 
 				result = InvokeSelect (SelectMethod, paramValues);
 
+				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
+					arguments.TotalRowCount = QueryTotalRowCount (MergeParameterValues (SelectParameters, null, null), arguments);
+				
 				if (owner.EnableCaching)
 					owner.Cache.SetCachedObject (SelectMethod, SelectParameters, result);
 			}

Modified: trunk/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
===================================================================
--- trunk/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:22:47 UTC (rev 141061)
+++ trunk/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:24:40 UTC (rev 141062)
@@ -19,6 +19,7 @@
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/BaseWorkerRequest.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FakeMembershipProvider.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FormRequest.cs
+../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Global.asax.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/IForeignData.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/HandlerInvoker.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyHandler.cs

Modified: trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:22:47 UTC (rev 141061)
+++ trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:24:40 UTC (rev 141062)
@@ -1,3 +1,11 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ListView.cs: LoadControlState must call OnTotalRowCountAvailable
+	after restoring the state, so that all parties subscribed to that
+	event are given chance to react accordingly.
+	SetPageProperties should use values stored in
+	PagePropertiesChangingEventArgs arguments after handler returns.
+
 2009-06-25  Marek Habersack  <mhabersack at novell.com>
 
 	* LinqDataSource.cs: make ContextType not throw an exception when

Modified: trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
===================================================================
--- trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:22:47 UTC (rev 141061)
+++ trunk/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:24:40 UTC (rev 141062)
@@ -1416,6 +1416,8 @@
 				_sortDirection = (SortDirection)o;
 			if ((o = state [CSTATE_SORTEXPRESSION]) != null)
 				_sortExpression = (string)o;
+			
+			OnTotalRowCountAvailable (new PageEventArgs (_startRowIndex, _maximumRows, _totalRowCount));
 		}
 	
 		protected override void LoadViewState (object savedState)
@@ -2002,11 +2004,14 @@
 				if (databind) {
 					var args = new PagePropertiesChangingEventArgs (startRowIndex, maximumRows);
 					OnPagePropertiesChanging (args);
+					_startRowIndex = args.StartRowIndex;
+					_maximumRows = args.MaximumRows;
+					
+				} else {
+					_startRowIndex = startRowIndex;
+					_maximumRows = maximumRows;
 				}
 
-				_startRowIndex = startRowIndex;
-				_maximumRows = maximumRows;
-
 				if (databind)
 					OnPagePropertiesChanged (EventArgs.Empty);
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:25:27 2009
From: mono-patches-list at lists.ximian.com (Marek Habersack (grendello@gmail.com))
Date: Tue,  1 Sep 2009 15:25:27 -0400 (EDT)
Subject: [Mono-patches] r141063 - in branches/mono-2-4/mcs/class:
	System.Web/System.Web.UI.WebControls System.Web.Extensions
	System.Web.Extensions/System.Web.UI.WebControls
Message-ID: <20090901192527.E24E89472C@mono-cvs.ximian.com>

Author: mhabersack
Date: 2009-09-01 15:25:27 -0400 (Tue, 01 Sep 2009)
New Revision: 141063

Modified:
   branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
   branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
   branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
   branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
Log:
Backport of r141062

Modified: branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:24:40 UTC (rev 141062)
+++ branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:27 UTC (rev 141063)
@@ -1,3 +1,9 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ObjectDataSourceView.cs: ExecuteSelect must call
+	QueryTotalRowCount after executing the select method (that's what
+	.NET does)
+
 2009-08-21  Marek Habersack  <mhabersack at novell.com>
 
 	* Menu.cs: separator image is rendered next to the item in

Modified: branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
--- branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:24:40 UTC (rev 141062)
+++ branches/mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:25:27 UTC (rev 141063)
@@ -713,10 +713,7 @@
 				OnSelecting (args);
 				if (args.Cancel)
 					return new ArrayList ();
-
-				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
-					arguments.TotalRowCount = QueryTotalRowCount (paramValues, arguments);
-
+				
 				if (CanPage) {
 					if (StartRowIndexParameterName.Length == 0)
 						throw new InvalidOperationException ("Paging is enabled, but the StartRowIndexParameterName property is not set.");
@@ -731,6 +728,9 @@
 
 				result = InvokeSelect (SelectMethod, paramValues);
 
+				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
+					arguments.TotalRowCount = QueryTotalRowCount (MergeParameterValues (SelectParameters, null, null), arguments);
+				
 				if (owner.EnableCaching)
 					owner.Cache.SetCachedObject (SelectMethod, SelectParameters, result);
 			}

Modified: branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
===================================================================
--- branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:24:40 UTC (rev 141062)
+++ branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:25:27 UTC (rev 141063)
@@ -19,6 +19,7 @@
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/BaseWorkerRequest.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FakeMembershipProvider.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FormRequest.cs
+../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Global.asax.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/IForeignData.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/HandlerInvoker.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyHandler.cs

Modified: branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
===================================================================
--- branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:24:40 UTC (rev 141062)
+++ branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:27 UTC (rev 141063)
@@ -1,3 +1,11 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ListView.cs: LoadControlState must call OnTotalRowCountAvailable
+	after restoring the state, so that all parties subscribed to that
+	event are given chance to react accordingly.
+	SetPageProperties should use values stored in
+	PagePropertiesChangingEventArgs arguments after handler returns.
+
 2009-03-03  Marek Habersack  <mhabersack at novell.com>
 
 	* ListView.cs: SetPageProperties invoked the

Modified: branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
===================================================================
--- branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:24:40 UTC (rev 141062)
+++ branches/mono-2-4/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:25:27 UTC (rev 141063)
@@ -1416,6 +1416,8 @@
 				_sortDirection = (SortDirection)o;
 			if ((o = state [CSTATE_SORTEXPRESSION]) != null)
 				_sortExpression = (string)o;
+			
+			OnTotalRowCountAvailable (new PageEventArgs (_startRowIndex, _maximumRows, _totalRowCount));
 		}
 	
 		protected override void LoadViewState (object savedState)
@@ -2002,11 +2004,14 @@
 				if (databind) {
 					var args = new PagePropertiesChangingEventArgs (startRowIndex, maximumRows);
 					OnPagePropertiesChanging (args);
+					_startRowIndex = args.StartRowIndex;
+					_maximumRows = args.MaximumRows;
+					
+				} else {
+					_startRowIndex = startRowIndex;
+					_maximumRows = maximumRows;
 				}
 
-				_startRowIndex = startRowIndex;
-				_maximumRows = maximumRows;
-
 				if (databind)
 					OnPagePropertiesChanged (EventArgs.Empty);
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:25:56 2009
From: mono-patches-list at lists.ximian.com (Marek Habersack (grendello@gmail.com))
Date: Tue,  1 Sep 2009 15:25:56 -0400 (EDT)
Subject: [Mono-patches] r141064 - in branches/mono-2-4-2/mcs/class:
	System.Web/System.Web.UI.WebControls System.Web.Extensions
	System.Web.Extensions/System.Web.UI.WebControls
Message-ID: <20090901192556.DD9749472C@mono-cvs.ximian.com>

Author: mhabersack
Date: 2009-09-01 15:25:56 -0400 (Tue, 01 Sep 2009)
New Revision: 141064

Modified:
   branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
   branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
   branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
   branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
Log:
Backport of r141062

Modified: branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:27 UTC (rev 141063)
+++ branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:56 UTC (rev 141064)
@@ -1,3 +1,9 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ObjectDataSourceView.cs: ExecuteSelect must call
+	QueryTotalRowCount after executing the select method (that's what
+	.NET does)
+
 2009-08-21  Marek Habersack  <mhabersack at novell.com>
 
 	* Menu.cs: separator image is rendered next to the item in

Modified: branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
--- branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:25:27 UTC (rev 141063)
+++ branches/mono-2-4-2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs	2009-09-01 19:25:56 UTC (rev 141064)
@@ -713,10 +713,7 @@
 				OnSelecting (args);
 				if (args.Cancel)
 					return new ArrayList ();
-
-				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
-					arguments.TotalRowCount = QueryTotalRowCount (paramValues, arguments);
-
+				
 				if (CanPage) {
 					if (StartRowIndexParameterName.Length == 0)
 						throw new InvalidOperationException ("Paging is enabled, but the StartRowIndexParameterName property is not set.");
@@ -731,6 +728,9 @@
 
 				result = InvokeSelect (SelectMethod, paramValues);
 
+				if (CanRetrieveTotalRowCount && arguments.RetrieveTotalRowCount)
+					arguments.TotalRowCount = QueryTotalRowCount (MergeParameterValues (SelectParameters, null, null), arguments);
+				
 				if (owner.EnableCaching)
 					owner.Cache.SetCachedObject (SelectMethod, SelectParameters, result);
 			}

Modified: branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources
===================================================================
--- branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:25:27 UTC (rev 141063)
+++ branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.Extensions_test.dll.sources	2009-09-01 19:25:56 UTC (rev 141064)
@@ -19,6 +19,7 @@
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/BaseWorkerRequest.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FakeMembershipProvider.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/FormRequest.cs
+../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Global.asax.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/IForeignData.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/HandlerInvoker.cs
 ../../System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyHandler.cs

Modified: branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog
===================================================================
--- branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:27 UTC (rev 141063)
+++ branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ChangeLog	2009-09-01 19:25:56 UTC (rev 141064)
@@ -1,3 +1,11 @@
+2009-09-01  Marek Habersack  <mhabersack at novell.com>
+
+	* ListView.cs: LoadControlState must call OnTotalRowCountAvailable
+	after restoring the state, so that all parties subscribed to that
+	event are given chance to react accordingly.
+	SetPageProperties should use values stored in
+	PagePropertiesChangingEventArgs arguments after handler returns.
+
 2009-03-03  Marek Habersack  <mhabersack at novell.com>
 
 	* ListView.cs: SetPageProperties invoked the

Modified: branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs
===================================================================
--- branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:25:27 UTC (rev 141063)
+++ branches/mono-2-4-2/mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs	2009-09-01 19:25:56 UTC (rev 141064)
@@ -1416,6 +1416,8 @@
 				_sortDirection = (SortDirection)o;
 			if ((o = state [CSTATE_SORTEXPRESSION]) != null)
 				_sortExpression = (string)o;
+			
+			OnTotalRowCountAvailable (new PageEventArgs (_startRowIndex, _maximumRows, _totalRowCount));
 		}
 	
 		protected override void LoadViewState (object savedState)
@@ -2002,11 +2004,14 @@
 				if (databind) {
 					var args = new PagePropertiesChangingEventArgs (startRowIndex, maximumRows);
 					OnPagePropertiesChanging (args);
+					_startRowIndex = args.StartRowIndex;
+					_maximumRows = args.MaximumRows;
+					
+				} else {
+					_startRowIndex = startRowIndex;
+					_maximumRows = maximumRows;
 				}
 
-				_startRowIndex = startRowIndex;
-				_maximumRows = maximumRows;
-
 				if (databind)
 					OnPagePropertiesChanged (EventArgs.Empty);
 			}


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:28:15 2009
From: mono-patches-list at lists.ximian.com (Andrew Jorgensen (ajorgensen@novell.com)
Date: Tue,  1 Sep 2009 15:28:15 -0400 (EDT)
Subject: [Mono-patches] r141065 - trunk/mono
Message-ID: <20090901192815.6246A9472C@mono-cvs.ximian.com>

Author: ajorg
Date: 2009-09-01 15:28:15 -0400 (Tue, 01 Sep 2009)
New Revision: 141065

Added:
   trunk/mono/mono-core.spec.in
Modified:
   trunk/mono/
   trunk/mono/configure.in
Log:
add spec file for monkeywrench


Property changes on: trunk/mono
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
_tmpinst
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.h.in
config.log
config.status
config.sub
configure
libtool
ltconfig
ltmain.sh
mono-*.tar.gz
*.pc
mono.spec
semantic.cache
stamp-h
stamp-h.in
stamp-h1
tmpinst-dir.stamp
missing
compile
depcomp
install-sh
doltlibtool
doltcompile

   + Makefile
Makefile.in
_tmpinst
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.h.in
config.log
config.status
config.sub
configure
libtool
ltconfig
ltmain.sh
mono-*.tar.gz
*.pc
mono-core.spec
semantic.cache
stamp-h
stamp-h.in
stamp-h1
tmpinst-dir.stamp
missing
compile
depcomp
install-sh
doltlibtool
doltcompile


Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in	2009-09-01 19:25:56 UTC (rev 141064)
+++ trunk/mono/configure.in	2009-09-01 19:28:15 UTC (rev 141065)
@@ -2495,6 +2495,7 @@
 
 AC_OUTPUT([
 Makefile
+mono-core.spec
 mono-uninstalled.pc
 scripts/mono-find-provides
 scripts/mono-find-requires

Copied: trunk/mono/mono-core.spec.in (from rev 141060, trunk/release/packaging/rpm_defs/mono-core/mono-core.spec)
===================================================================
--- trunk/mono/mono-core.spec.in	                        (rev 0)
+++ trunk/mono/mono-core.spec.in	2009-09-01 19:28:15 UTC (rev 141065)
@@ -0,0 +1,1268 @@
+%{!?ext_man: %define ext_man .gz}
+
+Name:           mono-core
+License:        LGPL v2.1 only
+Group:          Development/Languages/Mono
+Summary:        A .NET Runtime Environment
+Url:            http://go-mono.org/
+Version:        @VERSION@
+Release:        0
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        mono-%{version}.tar.bz2
+ExclusiveArch:  %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       mono = %{version}-%{release}
+Provides:       mono-ikvm = %{version}-%{release}
+Obsoletes:      mono
+Obsoletes:      mono-drawing
+Obsoletes:      mono-cairo
+Obsoletes:      mono-xml-relaxng
+Obsoletes:      mono-posix
+Obsoletes:      mono-ziplib
+Obsoletes:      mono-ikvm
+Provides:       mono-drawing
+Provides:       mono-cairo
+Provides:       mono-xml-relaxng
+Provides:       mono-posix
+Provides:       mono-ziplib
+# This version of mono has issues with the following versions of apps:
+#  (not because of regressions, but because bugfixes in mono uncover bugs in the apps)
+Conflicts:      helix-banshee < 1.0
+Conflicts:      banshee < 1.0
+Conflicts:      f-spot < 0.4
+Conflicts:      mono-addins < 0.3.1
+# Only use recommends for 11.0 and up
+%if 0%{?suse_version} >= 1100
+Recommends:     libgdiplus0
+%else
+Requires:       libgdiplus0
+%endif
+BuildRequires:  glib2-devel zlib-devel
+#######  distro specific changes  ########
+#####
+#### suse options ####
+%if 0%{?suse_version}
+# For some reason these weren't required in 10.2 and before... ?
+%if 0%{suse_version} >= 1030
+BuildRequires:  bison
+# Add valgrind support for 10.3 and above on archs that have it
+%ifarch %ix86 x86_64 ppc ppc64
+BuildRequires:  valgrind-devel
+%endif
+%endif
+%if 0%{suse_version} >= 1020
+BuildRequires:  xorg-x11-libX11
+%endif
+%if 0%{sles_version} == 10
+BuildRequires:  xorg-x11-devel
+%endif
+%if 0%{suse_version} == 1010
+BuildRequires:  xorg-x11-devel
+%endif
+%if 0%{sles_version} == 9
+%define configure_options export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig
+BuildRequires:  XFree86-devel XFree86-libs pkgconfig
+%endif
+%endif
+# Fedora x11
+%if 0%{?fedora_version}
+BuildRequires:  libX11
+%endif
+# rhel x11
+%if 0%{?rhel_version}
+BuildRequires:  libX11
+%endif
+#####
+#######  End of distro specific changes  ########
+# Why was this needed?
+%ifarch s390 s390x
+PreReq:         grep
+%endif
+# This lib only needed for ia64
+%ifarch ia64
+BuildRequires:  libunwind-devel
+%endif
+# TODO:
+# This won't work until the rpm package passes .config files to mono-find-requires
+#%define __find_provides env MONO_PREFIX=%{buildroot}/usr /usr/lib/rpm/find-provides
+#%define __find_requires env MONO_PREFIX=%{buildroot}/usr /usr/lib/rpm/find-requires
+%if 0%{?fedora_version} || 0%{?rhel_version}
+# Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros)
+%define _use_internal_dependency_generator 0
+%endif
+%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}%{_bindir}/mono-find-provides ; } | sort | uniq'
+%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}%{_bindir}/mono-find-requires ; } | sort | uniq'
+
+%description
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -f mcs.lang
+%defattr(-, root, root)
+%doc AUTHORS COPYING.LIB ChangeLog NEWS README
+%_bindir/mono
+%_libdir/libmono.so.*
+%_mandir/man1/mono.1%ext_man
+# manpages
+%_mandir/man5/mono-config.5%ext_man
+%_mandir/man1/mcs.1%ext_man
+%_mandir/man1/certmgr.1%ext_man
+%_mandir/man1/chktrust.1%ext_man
+%_mandir/man1/csharp.1%ext_man
+%_mandir/man1/setreg.1%ext_man
+%_mandir/man1/gacutil.1%ext_man
+%_mandir/man1/sn.1%ext_man
+%_mandir/man1/mozroots.1%ext_man
+# wrappers
+%_bindir/certmgr
+%_bindir/chktrust
+%_bindir/csharp
+%_bindir/gacutil
+%_bindir/gacutil1
+%_bindir/gacutil2
+%_bindir/gmcs
+%_bindir/mono-test-install
+%_bindir/mcs
+%_bindir/mcs1
+%_bindir/mozroots
+%_bindir/setreg
+%_bindir/sn
+# exes
+%_prefix/lib/mono/1.0/certmgr.exe*
+%_prefix/lib/mono/1.0/chktrust.exe*
+%_prefix/lib/mono/1.0/gacutil.exe*
+%_prefix/lib/mono/2.0/gacutil.exe*
+%_prefix/lib/mono/2.0/csharp.exe*
+%_prefix/lib/mono/2.0/gmcs.exe*
+%_prefix/lib/mono/1.0/mcs.exe*
+%_prefix/lib/mono/1.0/mozroots.exe*
+%_prefix/lib/mono/1.0/setreg.exe*
+%_prefix/lib/mono/1.0/sn.exe*
+%_prefix/lib/mono/gac/cscompmgd
+%_prefix/lib/mono/1.0/cscompmgd.dll
+%_prefix/lib/mono/2.0/cscompmgd.dll
+%_prefix/lib/mono/gac/I18N.West
+%_prefix/lib/mono/1.0/I18N.West.dll
+%_prefix/lib/mono/2.0/I18N.West.dll
+%_prefix/lib/mono/gac/I18N
+%_prefix/lib/mono/1.0/I18N.dll
+%_prefix/lib/mono/2.0/I18N.dll
+%_prefix/lib/mono/gac/Mono.CompilerServices.SymbolWriter
+%_prefix/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll
+%_prefix/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
+%_prefix/lib/mono/gac/Mono.GetOptions
+%_prefix/lib/mono/1.0/Mono.GetOptions.dll
+%_prefix/lib/mono/2.0/Mono.GetOptions.dll
+%_prefix/lib/mono/gac/Mono.Simd
+%_prefix/lib/mono/2.0/Mono.Simd.dll
+%_prefix/lib/mono/gac/Mono.Management
+%_prefix/lib/mono/2.0/Mono.Management.dll
+%_prefix/lib/mono/gac/Mono.Tasklets
+%_prefix/lib/mono/2.0/Mono.Tasklets.dll
+%_prefix/lib/mono/gac/Mono.Security
+%_prefix/lib/mono/1.0/Mono.Security.dll
+%_prefix/lib/mono/2.0/Mono.Security.dll
+%_prefix/lib/mono/gac/System.Security
+%_prefix/lib/mono/1.0/System.Security.dll
+%_prefix/lib/mono/2.0/System.Security.dll
+%_prefix/lib/mono/gac/System.Xml
+%_prefix/lib/mono/1.0/System.Xml.dll
+%_prefix/lib/mono/2.0/System.Xml.dll
+%_prefix/lib/mono/gac/System.Xml.Linq
+%_prefix/lib/mono/2.0/System.Xml.Linq.dll
+%_prefix/lib/mono/gac/System
+%_prefix/lib/mono/1.0/System.dll
+%_prefix/lib/mono/2.0/System.dll
+%_prefix/lib/mono/gac/System.Configuration
+%_prefix/lib/mono/2.0/System.Configuration.dll
+%_prefix/lib/mono/1.0/mscorlib.dll*
+%_prefix/lib/mono/2.0/mscorlib.dll*
+%dir %_sysconfdir/mono
+%dir %_sysconfdir/mono/1.0
+%dir %_sysconfdir/mono/2.0
+%dir %_prefix/lib/mono
+%dir %_prefix/lib/mono/1.0
+%dir %_prefix/lib/mono/2.0
+%dir %_prefix/lib/mono/3.5
+%dir %_prefix/lib/mono/gac
+%config %_sysconfdir/mono/config
+%config %_sysconfdir/mono/1.0/machine.config
+%config %_sysconfdir/mono/2.0/machine.config
+%config %_sysconfdir/mono/2.0/settings.map
+%_prefix/lib/mono/gac/Mono.C5
+%_prefix/lib/mono/2.0/Mono.C5.dll
+# ikvm helper
+%_prefix/%_lib/libikvm-native.so
+%_prefix/lib/mono/gac/System.Drawing
+%_prefix/lib/mono/1.0/System.Drawing.dll
+%_prefix/lib/mono/2.0/System.Drawing.dll
+%_libdir/libMonoPosixHelper.so*
+%_prefix/lib/mono/gac/Mono.Posix
+%_prefix/lib/mono/1.0/Mono.Posix.dll
+%_prefix/lib/mono/2.0/Mono.Posix.dll
+%_prefix/lib/mono/gac/Mono.Cairo
+%_prefix/lib/mono/1.0/Mono.Cairo.dll
+%_prefix/lib/mono/2.0/Mono.Cairo.dll
+%_prefix/lib/mono/gac/ICSharpCode.SharpZipLib
+%_prefix/lib/mono/1.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/2.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
+%_prefix/lib/mono/gac/Microsoft.VisualC
+%_prefix/lib/mono/1.0/Microsoft.VisualC.dll
+%_prefix/lib/mono/2.0/Microsoft.VisualC.dll
+%_prefix/lib/mono/gac/Commons.Xml.Relaxng
+%_prefix/lib/mono/1.0/Commons.Xml.Relaxng.dll
+%_prefix/lib/mono/2.0/Commons.Xml.Relaxng.dll
+%_prefix/lib/mono/gac/CustomMarshalers
+%_prefix/lib/mono/1.0/CustomMarshalers.dll
+%_prefix/lib/mono/2.0/CustomMarshalers.dll
+%_prefix/lib/mono/gac/OpenSystem.C
+%_prefix/lib/mono/1.0/OpenSystem.C.dll
+%_prefix/lib/mono/2.0/OpenSystem.C.dll
+%_prefix/lib/mono/gac/System.Core
+%_prefix/lib/mono/2.0/System.Core.dll
+%_prefix/lib/mono/gac/Mono.CSharp
+%_prefix/lib/mono/2.0/Mono.CSharp.dll
+%_prefix/lib/mono/gac/Mono.Cecil
+%_prefix/lib/mono/gac/Mono.Cecil.Mdb
+# localizations?
+#%_datadir/locale/*/LC_MESSAGES/mcs.mo
+# Not sure if autobuild allows this...
+
+%post
+/sbin/ldconfig
+%ifarch s390 s390x
+if grep -q "machine = 9672" /proc/cpuinfo 2>/dev/null ; then
+    # anchor for rebuild on failure
+    echo "mono may not work correctly on G5"
+fi
+%endif
+
+%postun -p /sbin/ldconfig
+
+%package -n mono-jscript
+License:        LGPL v2.1 only
+Summary:        JScript .NET support for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%description -n mono-jscript
+This package contains the JScript .NET compiler and language runtime.
+This allows you to compile and run JScript.NET application and
+assemblies.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-jscript
+%defattr(-, root, root)
+%_bindir/mjs
+%_prefix/lib/mono/1.0/mjs.exe*
+%_prefix/lib/mono/gac/Microsoft.JScript
+%_prefix/lib/mono/1.0/Microsoft.JScript.dll
+%_prefix/lib/mono/2.0/Microsoft.JScript.dll
+
+%package -n mono-locale-extras
+License:        LGPL v2.1 only
+Summary:        Extra locale information
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%description -n mono-locale-extras
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Extra locale information.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-locale-extras
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/I18N.MidEast
+%_prefix/lib/mono/1.0/I18N.MidEast.dll
+%_prefix/lib/mono/2.0/I18N.MidEast.dll
+%_prefix/lib/mono/gac/I18N.Rare
+%_prefix/lib/mono/1.0/I18N.Rare.dll
+%_prefix/lib/mono/2.0/I18N.Rare.dll
+%_prefix/lib/mono/gac/I18N.CJK
+%_prefix/lib/mono/1.0/I18N.CJK.dll
+%_prefix/lib/mono/2.0/I18N.CJK.dll
+%_prefix/lib/mono/gac/I18N.Other
+%_prefix/lib/mono/1.0/I18N.Other.dll
+%_prefix/lib/mono/2.0/I18N.Other.dll
+
+%package -n mono-data
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Obsoletes:      mono-ms-enterprise
+Obsoletes:      mono-novell-directory
+Obsoletes:      mono-directory
+Provides:       mono-ms-enterprise
+Provides:       mono-novell-directory
+Provides:       mono-directory
+
+%description -n mono-data
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-data
+%defattr(-, root, root)
+%_prefix/lib/mono/2.0/sqlmetal.exe*
+%_prefix/lib/mono/2.0/sqlsharp.exe*
+%_bindir/sqlmetal
+%_bindir/sqlsharp
+%_mandir/man1/sqlsharp.1%ext_man
+%_prefix/lib/mono/gac/System.Data
+%_prefix/lib/mono/1.0/System.Data.dll
+%_prefix/lib/mono/2.0/System.Data.dll
+%_prefix/lib/mono/gac/System.Data.Linq
+%_prefix/lib/mono/2.0/System.Data.Linq.dll
+%_prefix/lib/mono/gac/Mono.Data
+%_prefix/lib/mono/1.0/Mono.Data.dll
+%_prefix/lib/mono/2.0/Mono.Data.dll
+%_prefix/lib/mono/gac/Mono.Data.Tds
+%_prefix/lib/mono/1.0/Mono.Data.Tds.dll
+%_prefix/lib/mono/2.0/Mono.Data.Tds.dll
+%_prefix/lib/mono/gac/Mono.Data.TdsClient
+%_prefix/lib/mono/1.0/Mono.Data.TdsClient.dll
+%_prefix/lib/mono/2.0/Mono.Data.TdsClient.dll
+%_prefix/lib/mono/gac/System.EnterpriseServices
+%_prefix/lib/mono/1.0/System.EnterpriseServices.dll
+%_prefix/lib/mono/2.0/System.EnterpriseServices.dll
+%_prefix/lib/mono/gac/Novell.Directory.Ldap
+%_prefix/lib/mono/1.0/Novell.Directory.Ldap.dll
+%_prefix/lib/mono/2.0/Novell.Directory.Ldap.dll
+%_prefix/lib/mono/gac/System.DirectoryServices
+%_prefix/lib/mono/1.0/System.DirectoryServices.dll
+%_prefix/lib/mono/2.0/System.DirectoryServices.dll
+%_prefix/lib/mono/gac/System.Transactions
+%_prefix/lib/mono/2.0/System.Transactions.dll
+%_prefix/lib/mono/gac/System.Data.DataSetExtensions
+%_prefix/lib/mono/2.0/System.Data.DataSetExtensions.dll
+
+%package -n mono-winforms
+License:        LGPL v2.1 only
+Summary:        Mono's Windows Forms implementation
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Provides:       mono-window-forms
+Obsoletes:      mono-window-forms
+
+%description -n mono-winforms
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Mono's Windows Forms implementation.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-winforms
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/System.Windows.Forms
+%_prefix/lib/mono/1.0/System.Windows.Forms.dll
+%_prefix/lib/mono/2.0/System.Windows.Forms.dll
+%_prefix/lib/mono/gac/Accessibility
+%_prefix/lib/mono/1.0/Accessibility.dll
+%_prefix/lib/mono/2.0/Accessibility.dll
+%_prefix/lib/mono/gac/System.Design
+%_prefix/lib/mono/1.0/System.Design.dll
+%_prefix/lib/mono/2.0/System.Design.dll
+%_prefix/lib/mono/gac/System.Drawing.Design
+%_prefix/lib/mono/1.0/System.Drawing.Design.dll
+%_prefix/lib/mono/2.0/System.Drawing.Design.dll
+# TODO: Post 1.2.5:
+%_prefix/lib/mono/1.0/Mono.WebBrowser.dll
+%_prefix/lib/mono/2.0/Mono.WebBrowser.dll
+%_prefix/lib/mono/gac/Mono.WebBrowser
+
+%package -n ibm-data-db2
+License:        LGPL v2.1 only
+Summary:        Database connectivity for DB2
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%description -n ibm-data-db2
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for DB2.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n ibm-data-db2
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/IBM.Data.DB2
+%_prefix/lib/mono/1.0/IBM.Data.DB2.dll
+%_prefix/lib/mono/2.0/IBM.Data.DB2.dll
+
+%package -n mono-extras
+License:        LGPL v2.1 only
+Summary:        Extra packages
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Obsoletes:      mono-ms-extras
+Provides:       mono-ms-extras
+
+%description -n mono-extras
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Extra packages.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-extras
+%defattr(-, root, root)
+%_mandir/man1/mono-service.1%ext_man
+%_bindir/mono-service
+%_bindir/mono-service2
+%_prefix/lib/mono/1.0/installutil.exe*
+%_prefix/lib/mono/2.0/installutil.exe*
+# These are errors because they should be symlinks, but they are copies, so rpmlint detects duplicate files
+%_prefix/lib/mono/gac/mono-service
+%_prefix/lib/mono/1.0/mono-service.exe*
+%_prefix/lib/mono/2.0/mono-service.exe*
+%_prefix/lib/mono/gac/System.Management
+%_prefix/lib/mono/1.0/System.Management.dll
+%_prefix/lib/mono/2.0/System.Management.dll
+%_prefix/lib/mono/gac/RabbitMQ.Client
+%_prefix/lib/mono/1.0/RabbitMQ.Client.dll
+%_prefix/lib/mono/2.0/RabbitMQ.Client.dll
+%_prefix/lib/mono/gac/System.Messaging
+%_prefix/lib/mono/1.0/System.Messaging.dll
+%_prefix/lib/mono/2.0/System.Messaging.dll
+%_prefix/lib/mono/gac/Mono.Messaging
+%_prefix/lib/mono/1.0/Mono.Messaging.dll
+%_prefix/lib/mono/2.0/Mono.Messaging.dll
+%_prefix/lib/mono/gac/Mono.Messaging.RabbitMQ
+%_prefix/lib/mono/1.0/Mono.Messaging.RabbitMQ.dll
+%_prefix/lib/mono/2.0/Mono.Messaging.RabbitMQ.dll
+%_prefix/lib/mono/gac/System.ServiceProcess
+%_prefix/lib/mono/1.0/System.ServiceProcess.dll
+%_prefix/lib/mono/2.0/System.ServiceProcess.dll
+%_prefix/lib/mono/gac/System.Configuration.Install
+%_prefix/lib/mono/1.0/System.Configuration.Install.dll
+%_prefix/lib/mono/2.0/System.Configuration.Install.dll
+%_prefix/lib/mono/gac/Microsoft.Vsa
+%_prefix/lib/mono/1.0/Microsoft.Vsa.dll
+%_prefix/lib/mono/2.0/Microsoft.Vsa.dll
+
+%package -n mono-data-sqlite
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+# TODO: Disable this, until a better solution is found
+#Requires:       sqlite2
+
+%description -n mono-data-sqlite
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-data-sqlite
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/Mono.Data.SqliteClient
+%_prefix/lib/mono/1.0/Mono.Data.SqliteClient.dll
+%_prefix/lib/mono/2.0/Mono.Data.SqliteClient.dll
+%_prefix/lib/mono/gac/Mono.Data.Sqlite
+%_prefix/lib/mono/1.0/Mono.Data.Sqlite.dll
+%_prefix/lib/mono/2.0/Mono.Data.Sqlite.dll
+
+%package -n mono-data-sybase
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+
+%description -n mono-data-sybase
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-data-sybase
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/Mono.Data.SybaseClient
+%_prefix/lib/mono/1.0/Mono.Data.SybaseClient.dll
+%_prefix/lib/mono/2.0/Mono.Data.SybaseClient.dll
+
+%package -n mono-wcf
+Summary:        Mono implementation of WCF, Windows Communication Foundation
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%description -n mono-wcf
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Mono implementation of WCF, Windows Communication Foundation
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+
+%files -n mono-wcf
+%defattr(-, root, root)
+%_bindir/svcutil
+%_prefix/lib/mono/gac/System.IdentityModel
+%_prefix/lib/mono/2.0/System.IdentityModel.dll
+%_prefix/lib/mono/gac/System.IdentityModel.Selectors
+%_prefix/lib/mono/2.0/System.IdentityModel.Selectors.dll
+%_prefix/lib/mono/gac/System.Runtime.Serialization
+%_prefix/lib/mono/2.0/System.Runtime.Serialization.dll
+%_prefix/lib/mono/gac/System.ServiceModel
+%_prefix/lib/mono/2.0/System.ServiceModel.dll
+%_prefix/lib/mono/gac/System.ServiceModel.Web
+%_prefix/lib/mono/2.0/System.ServiceModel.Web.dll
+%_prefix/lib/mono/2.0/svcutil.exe
+%_prefix/lib/mono/2.0/svcutil.exe.mdb
+%_libdir/pkgconfig/wcf.pc
+
+%package -n mono-web
+License:        X11/MIT; Ms-Pl
+Summary:        Mono implementation of ASP.NET, Remoting and Web Services
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Obsoletes:      mono-web-forms
+Obsoletes:      mono-web-services
+Obsoletes:      mono-remoting
+Provides:       mono-web-forms
+Provides:       mono-web-services
+Provides:       mono-remoting
+
+%description -n mono-web
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Mono implementation of ASP.NET, Remoting and Web Services.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-web
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/Mono.Http
+%_prefix/lib/mono/1.0/Mono.Http.dll
+%_prefix/lib/mono/2.0/Mono.Http.dll
+%_prefix/lib/mono/gac/Mono.Web
+%_prefix/lib/mono/2.0/Mono.Web.dll
+%_prefix/lib/mono/gac/System.Runtime.Remoting
+%_prefix/lib/mono/1.0/System.Runtime.Remoting.dll
+%_prefix/lib/mono/2.0/System.Runtime.Remoting.dll
+%_prefix/lib/mono/gac/System.Web
+%_prefix/lib/mono/1.0/System.Web.dll
+%_prefix/lib/mono/2.0/System.Web.dll
+%_prefix/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
+%_prefix/lib/mono/1.0/System.Runtime.Serialization.Formatters.Soap.dll
+%_prefix/lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
+%_prefix/lib/mono/gac/System.Web.Services
+%_prefix/lib/mono/1.0/System.Web.Services.dll
+%_prefix/lib/mono/2.0/System.Web.Services.dll
+%_prefix/lib/mono/gac/System.Web.Abstractions
+%_prefix/lib/mono/2.0/System.Web.Abstractions.dll
+%_prefix/lib/mono/gac/System.Web.Routing
+%_prefix/lib/mono/2.0/System.Web.Routing.dll
+%_prefix/lib/mono/gac/System.Web.Extensions
+%_prefix/lib/mono/2.0/System.Web.Extensions.dll
+%_prefix/lib/mono/compat-2.0/System.Web.Extensions.dll
+%_prefix/lib/mono/gac/System.Web.Extensions.Design
+%_prefix/lib/mono/2.0/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/3.5/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/compat-2.0/System.Web.Extensions.Design.dll
+%_prefix/lib/mono/gac/System.Web.DynamicData
+%_prefix/lib/mono/2.0/System.Web.DynamicData.dll
+%_prefix/lib/mono/gac/System.ComponentModel.DataAnnotations
+%_prefix/lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
+%_prefix/lib/mono/gac/System.Web.Mvc
+%_prefix/lib/mono/2.0/System.Web.Mvc.dll
+# pkg-config files
+%_libdir/pkgconfig/mono.web.pc
+%_libdir/pkgconfig/system.web.extensions_1.0.pc
+%_libdir/pkgconfig/system.web.extensions.design_1.0.pc
+%_libdir/pkgconfig/system.web.mvc.pc
+# exes
+%_prefix/lib/mono/1.0/disco.exe*
+%_prefix/lib/mono/1.0/soapsuds.exe*
+%_prefix/lib/mono/1.0/wsdl.exe*
+%_prefix/lib/mono/2.0/wsdl.exe*
+%_prefix/lib/mono/1.0/xsd.exe*
+%_prefix/lib/mono/2.0/xsd.exe*
+%_prefix/lib/mono/2.0/mconfig.exe*
+# shell wrappers
+%_bindir/disco
+%_bindir/mconfig
+%_bindir/soapsuds
+%_bindir/wsdl
+%_bindir/wsdl1
+%_bindir/wsdl2
+%_bindir/xsd
+%_bindir/xsd2
+# man pages
+%_mandir/man1/disco.1%ext_man
+%_mandir/man1/soapsuds.1%ext_man
+%_mandir/man1/wsdl.1%ext_man
+%_mandir/man1/xsd.1%ext_man
+%_mandir/man1/mconfig.1%ext_man
+%config %_sysconfdir/mono/browscap.ini
+%dir %_sysconfdir/mono/mconfig
+%config %_sysconfdir/mono/mconfig/config.xml
+%config %_sysconfdir/mono/1.0/DefaultWsdlHelpGenerator.aspx
+%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config %_sysconfdir/mono/2.0/web.config
+%config %_sysconfdir/mono/2.0/Browsers
+
+%package -n mono-data-oracle
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+
+%description -n mono-data-oracle
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-data-oracle
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/System.Data.OracleClient
+%_prefix/lib/mono/1.0/System.Data.OracleClient.dll
+%_prefix/lib/mono/2.0/System.Data.OracleClient.dll
+
+%package -n mono-data-postgresql
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+
+%description -n mono-data-postgresql
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-data-postgresql
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/Npgsql
+%_prefix/lib/mono/1.0/Npgsql.dll
+%_prefix/lib/mono/2.0/Npgsql.dll
+
+%package -n bytefx-data-mysql
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+
+%description -n bytefx-data-mysql
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n bytefx-data-mysql
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/ByteFX.Data
+%_prefix/lib/mono/1.0/ByteFX.Data.dll
+%_prefix/lib/mono/2.0/ByteFX.Data.dll
+
+%package -n mono-nunit
+License:        LGPL v2.1 only
+Summary:        NUnit Testing Framework
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+
+%package -n mono-data-firebird
+License:        LGPL v2.1 only
+Summary:        Database connectivity for Mono
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       mono-data == %version-%release
+
+%description -n mono-data-firebird
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+Database connectivity for Mono.
+
+
+
+%files -n mono-data-firebird
+%defattr(-, root, root)
+%_prefix/lib/mono/gac/FirebirdSql.Data.Firebird
+%_prefix/lib/mono/1.0/FirebirdSql.Data.Firebird.dll
+
+%description -n mono-nunit
+NUnit is a unit-testing framework for all .Net languages.  Initially
+ported from JUnit, the current release, version 2.2,  is the fourth
+major release of this  Unit based unit testing tool for Microsoft .NET.
+It is written entirely in C# and  has been completely redesigned to
+take advantage of many .NET language		 features, for example
+custom attributes and other reflection related capabilities. NUnit
+brings xUnit to all .NET languages.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-nunit
+%defattr(-, root, root)
+%_prefix/bin/nunit-console
+%_prefix/bin/nunit-console2
+%_prefix/lib/mono/1.0/nunit-console.exe*
+%_prefix/lib/mono/2.0/nunit-console.exe*
+%_prefix/lib/mono/gac/nunit.util
+%_prefix/lib/mono/1.0/nunit.util.dll
+%_prefix/lib/mono/2.0/nunit.util.dll
+%_prefix/lib/mono/gac/nunit.core
+%_prefix/lib/mono/1.0/nunit.core.dll
+%_prefix/lib/mono/2.0/nunit.core.dll
+%_prefix/lib/mono/gac/nunit.core.extensions
+%_prefix/lib/mono/1.0/nunit.core.extensions.dll
+%_prefix/lib/mono/2.0/nunit.core.extensions.dll
+%_prefix/lib/mono/gac/nunit.core.interfaces
+%_prefix/lib/mono/1.0/nunit.core.interfaces.dll
+%_prefix/lib/mono/2.0/nunit.core.interfaces.dll
+%_prefix/lib/mono/gac/nunit.framework
+%_prefix/lib/mono/1.0/nunit.framework.dll
+%_prefix/lib/mono/2.0/nunit.framework.dll
+%_prefix/lib/mono/gac/nunit.framework.extensions
+%_prefix/lib/mono/1.0/nunit.framework.extensions.dll
+%_prefix/lib/mono/2.0/nunit.framework.extensions.dll
+%_prefix/lib/mono/gac/nunit.mocks
+%_prefix/lib/mono/1.0/nunit.mocks.dll
+%_prefix/lib/mono/2.0/nunit.mocks.dll
+%_prefix/lib/mono/gac/nunit-console-runner
+%_prefix/lib/mono/1.0/nunit-console-runner.dll
+%_prefix/lib/mono/2.0/nunit-console-runner.dll
+
+%_libdir/pkgconfig/mono-nunit.pc
+
+%package -n mono-devel
+License:        LGPL v2.1 only
+Summary:        Mono development tools
+Group:          Development/Languages/Mono
+Requires:       mono-core == %version-%release
+Requires:       glib2-devel
+%if 0%{?monobuild}
+Requires:       libgdiplus0
+%else
+Requires:       libgdiplus0
+%endif
+# We build natively on ppc64 now
+%ifarch ppc64
+Provides:       mono-biarchcompat
+Obsoletes:      mono-biarchcompat
+%endif
+
+%description -n mono-devel
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. This package contains compilers and
+other tools needed to develop .NET applications.
+
+Mono development tools.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%post -n mono-devel
+/sbin/ldconfig
+if [ ! -d /opt/gnome ]; then
+sed -i 's:/opt/gnome:/usr:g' %_libdir/libmono.la
+fi
+
+%postun -n mono-devel -p /sbin/ldconfig
+
+%files -n mono-devel
+%defattr(-, root, root)
+# libs
+%_libdir/libmono.so
+%_libdir/libmono.a
+%verify(not size md5 mtime) %_libdir/libmono.la
+# exes
+%_prefix/lib/mono/1.0/makecert.exe*
+%_prefix/lib/mono/2.0/mono-api-info.exe*
+%_prefix/lib/mono/1.0/al.exe*
+%_prefix/lib/mono/2.0/al.exe*
+%_prefix/lib/mono/1.0/caspol.exe*
+%_prefix/lib/mono/1.0/cert2spc.exe*
+%_prefix/lib/mono/1.0/mono-cil-strip.exe*
+%_prefix/lib/mono/1.0/dtd2xsd.exe*
+%_prefix/lib/mono/1.0/genxs.exe*
+%_prefix/lib/mono/2.0/httpcfg.exe*
+%_prefix/lib/mono/1.0/ictool.exe*
+%_prefix/lib/mono/1.0/ilasm.exe*
+%_prefix/lib/mono/2.0/ilasm.exe*
+%_prefix/lib/mono/1.0/installvst.exe*
+%_prefix/lib/mono/1.0/mkbundle.exe*
+%_prefix/lib/mono/2.0/mkbundle.exe*
+%_prefix/lib/mono/1.0/monop.exe*
+%_prefix/lib/mono/2.0/monop.exe*
+%_prefix/lib/mono/1.0/permview.exe*
+%_prefix/lib/mono/1.0/resgen.exe*
+%_prefix/lib/mono/2.0/resgen.exe*
+%_prefix/lib/mono/1.0/secutil.exe*
+%_prefix/lib/mono/2.0/sgen.exe*
+%_prefix/lib/mono/1.0/signcode.exe*
+%_prefix/lib/mono/1.0/prj2make.exe*
+%_prefix/lib/mono/1.0/macpack.exe*
+%_prefix/lib/mono/2.0/mono-shlib-cop.exe*
+%_prefix/lib/mono/1.0/dtd2rng.exe*
+%_prefix/lib/mono/2.0/mono-xmltool.exe*
+%_prefix/lib/mono/2.0/pdb2mdb.exe*
+# xbuild related files
+%_prefix/lib/mono/2.0/xbuild.exe*
+%_prefix/lib/mono/2.0/Microsoft.Build.xsd
+%_prefix/lib/mono/2.0/Microsoft.Common.tasks
+%_prefix/lib/mono/2.0/Microsoft.Common.targets
+%_prefix/lib/mono/2.0/Microsoft.CSharp.targets
+%_prefix/lib/mono/2.0/Microsoft.VisualBasic.targets
+%_prefix/lib/mono/2.0/MSBuild
+%_prefix/lib/mono/2.0/xbuild.rsp
+# man pages
+%_mandir/man1/cert2spc.1%ext_man
+%_mandir/man1/mono-cil-strip.1%ext_man
+%_mandir/man1/dtd2xsd.1%ext_man
+%_mandir/man1/genxs.1%ext_man
+%_mandir/man1/httpcfg.1%ext_man
+%_mandir/man1/ilasm.1%ext_man
+%_mandir/man1/macpack.1%ext_man
+%_mandir/man1/makecert.1%ext_man
+%_mandir/man1/mkbundle.1%ext_man
+%_mandir/man1/monodis.1%ext_man
+%_mandir/man1/monop.1%ext_man
+%_mandir/man1/mono-shlib-cop.1%ext_man
+%_mandir/man1/permview.1%ext_man
+%_mandir/man1/pdb2mdb.1%ext_man
+%_mandir/man1/prj2make.1%ext_man
+%_mandir/man1/secutil.1%ext_man
+%_mandir/man1/sgen.1%ext_man
+%_mandir/man1/signcode.1%ext_man
+%_mandir/man1/al.1%ext_man
+%_mandir/man1/mono-xmltool.1%ext_man
+%_mandir/man1/resgen.1%ext_man
+%_mandir/man1/xbuild.1%ext_man
+# Shell wrappers
+%_bindir/al
+%_bindir/al1
+%_bindir/al2
+%_bindir/caspol
+%_bindir/cert2spc
+%_bindir/dtd2xsd
+%_bindir/dtd2rng
+%_bindir/genxs
+%_bindir/genxs1
+%_bindir/httpcfg
+%_bindir/ilasm
+%_bindir/ilasm1
+%_bindir/ilasm2
+%_bindir/installvst
+%_bindir/macpack
+%_bindir/makecert
+%_bindir/mkbundle
+%_bindir/mkbundle1
+%_bindir/mkbundle2
+%_bindir/monodis
+%_bindir/monolinker
+%_bindir/monop
+%_bindir/monop1
+%_bindir/monop2
+%_bindir/mono-api-info
+%_bindir/mono-cil-strip
+%_bindir/mono-find-provides
+%_bindir/mono-find-requires
+%_bindir/mono-shlib-cop
+%_bindir/mono-xmltool
+%_bindir/pdb2mdb
+%_bindir/pedump
+%_bindir/permview
+%_bindir/prj2make
+%_bindir/resgen
+%_bindir/resgen1
+%_bindir/resgen2
+%_bindir/secutil
+%_bindir/sgen
+%_bindir/signcode
+%_bindir/xbuild
+%_mandir/man1/monolinker.1%ext_man
+%_prefix/lib/mono/gac/PEAPI
+%_prefix/lib/mono/1.0/PEAPI.dll
+%_prefix/lib/mono/2.0/monolinker.*
+%_prefix/lib/mono/2.0/PEAPI.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks
+%_prefix/lib/mono/2.0/Microsoft.Build.Tasks.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Tasks.v3.5
+%_prefix/lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Framework
+%_prefix/lib/mono/2.0/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Framework.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities
+%_prefix/lib/mono/2.0/Microsoft.Build.Utilities.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Utilities.v3.5
+%_prefix/lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
+%_prefix/lib/mono/gac/Microsoft.Build.Engine
+%_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
+%_prefix/lib/mono/3.5/Microsoft.Build.Engine.dll
+%_prefix/lib/mono-source-libs
+%_bindir/monograph
+%_prefix/include/mono-1.0
+%_libdir/libmono-profiler-cov.*
+%_libdir/libmono-profiler-aot.*
+%_libdir/libmono-profiler-logging.*
+%_libdir/pkgconfig/mono.pc
+%_libdir/pkgconfig/dotnet.pc
+%_libdir/pkgconfig/dotnet35.pc
+%_libdir/pkgconfig/mono-cairo.pc
+%_libdir/pkgconfig/mono-options.pc
+%_libdir/pkgconfig/mono-lineeditor.pc
+%_libdir/pkgconfig/cecil.pc
+%_prefix/share/mono-1.0/mono/cil/cil-opcodes.xml
+# dirs
+%dir %_prefix/share/mono-1.0
+%dir %_prefix/share/mono-1.0/mono
+%dir %_prefix/share/mono-1.0/mono/cil
+# Reminder: when removing man pages in this list, they are not 
+#  yet gzipped
+
+%package -n monodoc-core
+License:        GNU General Public License (GPL)
+Summary:        Monodoc-Documentation tools for C# code
+Group:          Development/Tools/Other
+URL:            http://go-mono.org/
+Provides:       monodoc
+Obsoletes:      monodoc
+
+%description -n monodoc-core
+Monodoc-core contains documentation tools for C#.
+
+%files -n monodoc-core
+%defattr(-, root, root)
+%{_prefix}/lib/mono/2.0/mdoc.exe*
+%{_prefix}/lib/mono/1.0/mod.exe*
+%{_prefix}/lib/mono/gac/monodoc
+%{_prefix}/lib/mono/monodoc
+%{_bindir}/mdassembler
+%{_bindir}/mdoc
+%{_bindir}/mdoc-assemble
+%{_bindir}/mdoc-export-html
+%{_bindir}/mdoc-export-msxdoc
+%{_bindir}/mdoc-update
+%{_bindir}/mdoc-validate
+%{_bindir}/mdvalidater
+%{_bindir}/mod
+%{_bindir}/monodocer
+%{_bindir}/monodocs2html
+%{_bindir}/monodocs2slashdoc
+%{_prefix}/lib/monodoc
+%{_libdir}/pkgconfig/monodoc.pc
+%{_mandir}/man1/mdassembler.1%ext_man
+%{_mandir}/man1/mdoc-assemble.1%ext_man
+%{_mandir}/man1/mdoc-export-html.1%ext_man
+%{_mandir}/man1/mdoc-export-msxdoc.1%ext_man
+%{_mandir}/man1/mdoc-update.1%ext_man
+%{_mandir}/man1/mdoc-validate.1%ext_man
+%{_mandir}/man1/mdoc.1%ext_man
+%{_mandir}/man1/mdvalidater.1%ext_man
+%{_mandir}/man1/monodocer.1%ext_man
+%{_mandir}/man1/monodocs2html.1%ext_man
+%{_mandir}/man5/mdoc.5%ext_man
+
+%package -n mono-complete
+License:        LGPL v2.1 only
+Summary:        A .NET Runtime Environment
+Group:          Development/Languages/Mono
+Requires:       bytefx-data-mysql = %version-%release
+Requires:       ibm-data-db2 = %version-%release
+Requires:       mono-core = %version-%release
+Requires:       mono-data = %version-%release
+Requires:       mono-data-firebird = %version-%release
+Requires:       mono-data-oracle = %version-%release
+Requires:       mono-data-postgresql = %version-%release
+Requires:       mono-data-sqlite = %version-%release
+Requires:       mono-data-sybase = %version-%release
+Requires:       mono-devel = %version-%release
+Requires:       mono-extras = %version-%release
+Requires:       mono-jscript = %version-%release
+Requires:       mono-locale-extras = %version-%release
+Requires:       mono-nunit = %version-%release
+Requires:       mono-web = %version-%release
+Requires:       mono-wcf = %version-%release
+Requires:       mono-winforms = %version-%release
+
+%description -n mono-complete
+The Mono Project is an open development initiative that is working to
+develop an open source, Unix version of the .NET development platform.
+Its objective is to enable Unix developers to build and deploy
+cross-platform .NET applications. The project will implement various
+technologies that have been submitted to the ECMA for standardization.
+
+
+
+Authors:
+--------
+    Miguel de Icaza <miguel at ximian.com>
+    Paolo Molaro <lupus at ximian.com>
+    Dietmar Maurer <dietmar at ximian.com>
+
+%files -n mono-complete
+%defattr(-, root, root)
+# Directories
+# Put dir files here so we don't have an empty package
+%dir %_prefix/lib/mono/compat-1.0
+%dir %_prefix/lib/mono/compat-2.0
+
+%prep
+%setup -q -n mono-%{version}
+
+%build
+# These are only needed if there are patches to the runtime
+#rm -f libgc/libtool.m4
+#autoreconf --force --install
+#autoreconf --force --install libgc
+export CFLAGS=" $RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-strict-aliasing"
+# distro specific configure options
+%{?configure_options}
+%configure \
+  --with-jit=yes \
+  --with-ikvm=yes \
+  --with-moonlight=yes
+make
+
+%install
+make install DESTDIR=%buildroot
+# Remove unused files
+rm $RPM_BUILD_ROOT%_libdir/libMonoPosixHelper.a
+rm $RPM_BUILD_ROOT%_libdir/libMonoPosixHelper.la
+rm -f $RPM_BUILD_ROOT%_libdir/libikvm-native.a
+rm -f $RPM_BUILD_ROOT%_libdir/libikvm-native.la
+rm -fr $RPM_BUILD_ROOT%_prefix/lib/mono/gac/Mono.Security.Win32/[12]*
+rm $RPM_BUILD_ROOT%_prefix/lib/mono/1.0/Mono.Security.Win32.dll
+rm $RPM_BUILD_ROOT%_prefix/lib/mono/2.0/Mono.Security.Win32.dll
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.DGUX386
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.Mac
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.MacOSX
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.OS2
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.amiga
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.arm.cross
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.autoconf
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.changes
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.contributors
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.cords
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.darwin
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.dj
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.environment
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.ews4800
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.hp
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.linux
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.macros
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.rs6000
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.sgi
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.solaris2
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.uts
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/README.win32
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/barrett_diagram
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/debugging.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/gc.man
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/gcdescr.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/gcinterface.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/leak.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/scale.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/simple_example.html
+rm $RPM_BUILD_ROOT%_datadir/libgc-mono/tree.html
+rm $RPM_BUILD_ROOT%_mandir/man1/cilc.1
+rm $RPM_BUILD_ROOT%_mandir/man1/monostyle.1
+rm $RPM_BUILD_ROOT%_mandir/man1/oldmono.1
+rm $RPM_BUILD_ROOT%_mandir/man1/mint.1
+# Things we don't ship.
+# cilc
+rm $RPM_BUILD_ROOT%_bindir/cilc
+rm $RPM_BUILD_ROOT%_prefix/lib/mono/1.0/cilc*
+# jay
+rm $RPM_BUILD_ROOT%_bindir/jay
+rm -R $RPM_BUILD_ROOT%_datadir/jay
+rm $RPM_BUILD_ROOT%_mandir/man1/jay.1
+rm $RPM_BUILD_ROOT%_prefix/lib/mono/1.0/browsercaps-updater.exe*
+# New files to delete in 1.1.9.2
+rm -f $RPM_BUILD_ROOT%_libdir/libMonoSupportW.a
+rm -f $RPM_BUILD_ROOT%_libdir/libMonoSupportW.la
+rm -f $RPM_BUILD_ROOT%_libdir/libMonoSupportW.so
+# 1.1.17 updates:
+# This file moved to mono-basic
+rm -f $RPM_BUILD_ROOT%_bindir/mbas
+# 1.2.4 changes
+rm -f $RPM_BUILD_ROOT%_prefix/lib/mono/1.0/culevel.exe*
+# Post 1.2.5
+rm -f $RPM_BUILD_ROOT%_prefix/lib/mono/2.0/transform.exe
+# Post 2.2
+rm -f $RPM_BUILD_ROOT%_mandir/man1/monoburg.*
+# brp-compress doesn't search _mandir
+# so we cheat it
+ln -s . %buildroot%_prefix/usr
+RPM_BUILD_ROOT=%buildroot%_prefix /usr/lib/rpm/brp-compress
+rm %buildroot%_prefix/usr
+%find_lang mcs
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%changelog


From mono-patches-list at lists.ximian.com  Tue Sep  1 15:33:27 2009
From: mono-patches-list at lists.ximian.com (Ankit Jain (radical@corewars.org))
Date: Tue,  1 Sep 2009 15:33:27 -0400 (EDT)
Subject: [Mono-patches] r141066 - in branches/mono-2-4/mcs/class:
	Microsoft.Build.Engine/Microsoft.Build.BuildEngine
	Microsoft.Build.Tasks/Microsoft.Build.Tasks
	Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks
Message-ID: <20090901193327.9DFAB9472C@mono-cvs.ximian.com>

Author: ankit
Date: 2009-09-01 15:33:27 -0400 (Tue, 01 Sep 2009)
New Revision: 141066

Modified:
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemReference.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MetadataReference.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetBatchingImpl.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UsingTask.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
   branches/mono-2-4/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
   branches/mono-2-4/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ChangeLog
   branches/mono-2-4/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
Log:
Update xbuild and Microsoft.Build.* from trunk.

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

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

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

	* ResolveAssemblyReference.cs (ResolveReference): targetFrameworkDirectories
	can be null.

In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
2009-09-01  Ankit Jain  <jankit at novell.com>

	Fix bug #534965.
	* Project.cs (BuildTarget): Move caching of target outputs to ..
	* Target.cs: .. here. Move LogTargetSkipped also here.
	Ensure that caching happens for target dependencies also.

2009-09-01  Ankit Jain  <jankit at novell.com>

	* DirectoryScanner.cs (Scan): Ignore empty entries in includes and
	excludes.

2009-09-01  Ankit Jain  <jankit at novell.com>

	* 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.


Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BatchingImplBase.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -106,7 +106,7 @@
 		protected void ParseAttribute (string value)
 		{
 			Expression expr = new Expression ();
-			expr.Parse (value, true);
+			expr.Parse (value, ParseOptions.AllowItemsMetadataAndSplit);
 
 			foreach (object o in expr.Collection) {
 				MetadataReference mr = o as MetadataReference;

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -227,7 +227,7 @@
 		{
 			if (parent_item_group != null) {
 				Expression e = new Expression ();
-				e.Parse (value, true);
+				e.Parse (value, ParseOptions.AllowItemsNoMetadataAndSplit);
 				evaluatedMetadata [name] = (string) e.ConvertTo (parent_item_group.ParentProject,
 						typeof (string), ExpressionOptions.ExpandItemRefs);
 			} else
@@ -264,9 +264,9 @@
 			string includes, excludes;
 
 			includeExpr = new Expression ();
-			includeExpr.Parse (Include, true);
+			includeExpr.Parse (Include, ParseOptions.AllowItemsNoMetadataAndSplit);
 			excludeExpr = new Expression ();
-			excludeExpr.Parse (Exclude, true);
+			excludeExpr.Parse (Exclude, ParseOptions.AllowItemsNoMetadataAndSplit);
 			
 			includes = (string) includeExpr.ConvertTo (project, typeof (string), ExpressionOptions.ExpandItemRefs);
 			excludes = (string) excludeExpr.ConvertTo (project, typeof (string), ExpressionOptions.ExpandItemRefs);
@@ -360,7 +360,7 @@
 					// but letting this be here, incase BI.ConvertTo*
 					// is called directly
 					Expression expr = new Expression ();
-					expr.Parse (finalItemSpec, true);
+					expr.Parse (finalItemSpec, ParseOptions.AllowItemsNoMetadataAndSplit);
 
 					return (string) expr.ConvertTo (parent_item_group.ParentProject,
 							typeof (string), ExpressionOptions.ExpandItemRefs);

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -122,7 +122,7 @@
 
 			// In evaluate phase, properties are not expanded
 			Expression exp = new Expression ();
-			exp.Parse (Value, false, false);
+			exp.Parse (Value, ParseOptions.None);
 			evaluated.finalValue = (string) exp.ConvertTo (parentProject, typeof (string),
 					ExpressionOptions.DoNotExpandItemRefs);
 
@@ -150,7 +150,8 @@
 				Expression exp = new Expression ();
 
 				// in non-evaluation phase, properties are always expanded
-				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs, false);
+				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs ?
+							ParseOptions.AllowItems : ParseOptions.None);
 				return (string) exp.ConvertTo (project, typeof (string), options);
 			} finally {
 				converting = false;
@@ -172,7 +173,8 @@
 				Expression exp = new Expression ();
 
 				// in non-evaluation phase, properties are always expanded
-				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs, false);
+				exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs ?
+							ParseOptions.AllowItems : ParseOptions.None);
 				return (ITaskItem[]) exp.ConvertTo (project, typeof (ITaskItem[]), options);
 			} finally {
 				converting = false;

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -230,7 +230,7 @@
 					return false;
 				else {
 					Expression exp = new Expression ();
-					exp.Parse (str, true);
+					exp.Parse (str, ParseOptions.AllowItemsNoMetadataAndSplit);
 					return (bool) exp.ConvertTo (parentTarget.Project, typeof (bool),
 							ExpressionOptions.ExpandItemRefs);
 				}

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog	2009-09-01 19:33:27 UTC (rev 141066)
@@ -1,3 +1,34 @@
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	Fix bug #534965.
+	* Project.cs (BuildTarget): Move caching of target outputs to ..
+	* Target.cs: .. here. Move LogTargetSkipped also here.
+	Ensure that caching happens for target dependencies also.
+
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	* DirectoryScanner.cs (Scan): Ignore empty entries in includes and
+	excludes.
+
+2009-09-01  Ankit Jain  <jankit at novell.com>
+
+	* 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.
+
 2009-08-29  Ankit Jain  <jankit at novell.com>
 
 	* Expression.cs (ExpressionOptions): New.

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -122,7 +122,7 @@
 		static Token EvaluateToken (Token token, Project context)
 		{
 			Expression oe = new Expression ();
-			oe.Parse (token.Value, true);
+			oe.Parse (token.Value, ParseOptions.AllowItemsMetadataAndSplit);
 			return new Token ((string) oe.ConvertTo (context, typeof (string)), token.Type);
 		}
 	}

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -59,8 +59,8 @@
 			excludedItems = new Dictionary <string, bool> ();
 			includedItems = new List <string> ();
 			
-			splitInclude = includes.Split (';');
-			splitExclude = excludes.Split (';');
+			splitInclude = includes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+			splitExclude = excludes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
 			
 			if (excludes != String.Empty) {
 				foreach (string si in splitExclude) {

Modified: branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
===================================================================
--- branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs	2009-09-01 19:28:15 UTC (rev 141065)
+++ branches/mono-2-4/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs	2009-09-01 19:33:27 UTC (rev 141066)
@@ -65,18 +65,19 @@
 			this.expressionCollection = new ExpressionCollection ();
 		}
 
-		public void Parse (string expression, bool allowItems)
-		{
-			Parse (expression, allowItems, true);
-		}
-
-		// @split: Split on ';'
+		// Split: Split on ';'
 		//	   Eg. Property values don't need to be split
 		//
-		// @allowItems: item refs should not be treated as item refs!
+		// AllowItems: if false, item refs should not be treated as item refs!
 		//	        it converts them to strings in the final expressionCollection
-		public void Parse (string expression, bool allowItems, bool split)
+		//
+		// AllowMetadata: same as AllowItems, for metadata
+		public void Parse (string expression, ParseOptions options)
 		{
+			bool split = (options & ParseOptions.Split) == ParseOptions.Split;
+			bool allowItems = (options & ParseOptions.AllowItems) == ParseOptions.AllowItems;
+			bool allowMd = (options & ParseOptions.AllowMetadata) == ParseOptions.AllowMetadata;
+
 			expression = expression.Replace ('/', Path.DirectorySeparatorChar);
 			expression = expression.Replace ('\\', Path.DirectorySeparatorChar);
 		
@@ -117,7 +118,7 @@
 				}
 			}
 
-			CopyToExpressionCollection (p3, allowItems);
+			CopyToExpressionCollection (p3, allowItems, allowMd);
 		}
 
 		void Prepare (List <ArrayList> l, int length)
@@ -126,7 +127,7 @@
 				l.Add (null);
 		}
 		
-		void CopyToExpressionCollection (List <ArrayList> lists, bool allowItems)
+		void CopyToExpressionCollection (List <ArrayList> lists, bool allowItems, bool allowMd)
 		{
 			for (int i = 0; i < lists.Count; i++) {
 				foreach (object o in lists [i]) {
@@ -134,6 +135,9 @@
 						expressionCollection.Add (Utilities.Unescape ((string) o));
 					else if (!allowItems && o is ItemReference)
 						expressionCollection.Add (((ItemReference) o).OriginalString);
+					else if (!allowMd && o is MetadataReference) {
+						expressionCollection.Add (((MetadataReference) o).OriginalString);
+					}
 					else if (o is IReference)
 						expressionCollection.Add ((IReference) o);
 				}
@@ -246,7 +250,8 @@
 				
 				meta = m.Groups [MetadataRegex.GroupNumberFromName ("meta")].Value;
 				
-				mr = new MetadataReference (name, meta, m.Groups [0].Index, m.Groups [0].Length);
+				mr = new MetadataReference (text.Substring (m.Groups [0].Index, m.Groups [0].Length),
+								name, meta, m.Groups [0].Index, m.Groups [0].Length);
 				phase1.Add (mr);
 				m = m.NextMatch ();
 			}
@@ -326,6 +331,21 @@
 		}
 	}
 
+	[Flags]
+	enum ParseOptions {
+		// absenc