Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595

mcs/class/System.Xaml/Assembly/AssemblyInfo.cs

@@ -64,3 +64,7 @@ using System.Runtime.InteropServices;
 #endif
 
 [assembly: ComVisible (false)]
+
+#if !MOBILE
+[assembly: TypeForwardedTo (typeof (System.Windows.Markup.ValueSerializerAttribute))]
+#endif

mcs/class/System.Xaml/Makefile

@@ -5,11 +5,8 @@ include ../../build/rules.make
 RESOURCE_FILES = 
 
 LIBRARY = System.Xaml.dll
-LIB_MCS_FLAGS = \
-	        /r:System.dll \
-	        /r:System.Xml.dll \
-		/r:System.Core.dll \
-	        $(RESOURCE_FILES:%=/resource:%)
+LIB_REFS = System System.Xml System.Core
+LIB_MCS_FLAGS = $(RESOURCE_FILES:%=/resource:%)
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
@@ -18,7 +15,7 @@ TEST_EXTRA_DISTFILES = \
 	Test/XmlFiles/*.xml \
 	Test/XmlFiles/*.xaml
 
-VALID_PROFILE := $(filter 4 monodroid monotouch mobile mobile_static, $(FRAMEWORK_VERSION_MAJOR))
+VALID_PROFILE := $(filter 4 monodroid monotouch monotouch_watch mobile mobile_static, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xaml.dll
 NO_INSTALL = yes

mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs

@@ -1,51 +0,0 @@
-//
-// Copyright (C) 2010 Novell Inc. http://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.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Windows.Markup;
-using System.Xaml.Schema;
-
-namespace System.Windows.Markup
-{
-	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Interface, AllowMultiple = false, Inherited = true)]
-	[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyWindowsBase)]
-	public sealed class ValueSerializerAttribute : Attribute
-	{
-		public ValueSerializerAttribute (string valueSerializerTypeName)
-		{
-			ValueSerializerTypeName = valueSerializerTypeName;
-		}
-		
-		public ValueSerializerAttribute (Type valueSerializerType)
-		{
-			ValueSerializerType = valueSerializerType;
-		}
-		
-		public Type ValueSerializerType { get; private set; }
-		public string ValueSerializerTypeName { get; private set; }
-	}
-}
-

mcs/class/System.Xaml/System.Xaml.dll.sources

@@ -36,7 +36,6 @@ System.Windows.Markup/TypeExtensionConverter.cs
 System.Windows.Markup/UidPropertyAttribute.cs
 System.Windows.Markup/UsableDuringInitializationAttribute.cs
 System.Windows.Markup/ValueSerializer.cs
-System.Windows.Markup/ValueSerializerAttribute.cs
 System.Windows.Markup/WhitespaceSignificantCollectionAttribute.cs
 System.Windows.Markup/XData.cs
 System.Windows.Markup/XamlDeferLoadAttribute.cs

mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs

@@ -641,7 +641,7 @@ namespace MonoTests.System.Xaml
 #else
 			string ver = "net_4_0";
 #endif
-			return File.ReadAllText ("Test/XmlFiles/" + name).Trim ().Replace (">\n", ">\r\n").Replace ("net_4_0", ver);
+			return File.ReadAllText ("Test/XmlFiles/" + name).Trim ().Replace (">\n", ">\r\n").Replace ("net_4_0", ver).Replace ("\r\n", Environment.NewLine);
 		}
 
 		[Test]