Add netstandard2.0 target framework support for System.Xaml

src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>{9AC36357-34B7-40A1-95CA-FE9F46D089A7}</ProjectGuid>
     <AssemblyName>System.Xaml</AssemblyName>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <Platforms>AnyCPU;x64</Platforms>
 
     <NoWarn>$(NoWarn);0618;NU5125</NoWarn>
@@ -70,7 +70,7 @@
 
   <ItemGroup>
     <Compile Remove="System\Xaml\XamlProperty.cs" />
-    <Compile Remove="System\Windows\Markup\ValueSerializerAttribute.cs" />
+    <Compile Remove="System\Windows\Markup\ValueSerializerAttribute.cs" Condition="'$(TargetFramework)'=='net461' OR '$(TargetFramework)'=='netcoreapp3.0'" />
     <Compile Remove="System\Xaml\Schema\ClrProperty.cs" />
     <Compile Remove="System\Xaml\Schema\ImplicitProperty.cs" />
     <Compile Remove="System\Xaml\Schema\ClrAttachableEvent.cs" />

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ValueSerializerAttribute.cs

@@ -17,4 +17,68 @@
 using System;
 using System.Runtime.CompilerServices;
 
+#if NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1
+namespace System.Windows.Markup
+{
+    /// <summary>
+    /// Attribute to associate a ValueSerializer class with a value type or to override
+    /// which value serializer to use for a property. A value serializer can be associated
+    /// with an attached property by placing the attribute on the static accessor for the
+    /// attached property.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [TypeForwardedFrom("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+    public sealed class ValueSerializerAttribute : Attribute
+    {
+        private Type _valueSerializerType;
+        private string _valueSerializerTypeName;
+
+        /// <summary>
+        /// Constructor for the ValueSerializerAttribute
+        /// </summary>
+        /// <param name="valueSerializerType">Type of the value serializer being associated with a type or property</param>
+        public ValueSerializerAttribute(Type valueSerializerType)
+        {
+            _valueSerializerType = valueSerializerType;
+        }
+
+        /// <summary>
+        /// Constructor for the ValueSerializerAttribute
+        /// </summary>
+        /// <param name="valueSerializerTypeName">Fully qualified type name of the value serializer being associated with a type or property</param>
+        public ValueSerializerAttribute(string valueSerializerTypeName)
+        {
+            _valueSerializerTypeName = valueSerializerTypeName;
+        }
+
+        /// <summary>
+        /// The type of the value serializer to create for this type or property.
+        /// </summary>
+        public Type ValueSerializerType
+        {
+            get
+            {
+                if (_valueSerializerType == null && _valueSerializerTypeName != null)
+                    _valueSerializerType = Type.GetType(_valueSerializerTypeName);
+                return _valueSerializerType;
+            }
+        }
+
+        /// <summary>
+        /// The assembly qualified name of the value serializer type for this type or property.
+        /// </summary>
+        public string ValueSerializerTypeName
+        {
+            get
+            {
+                if (_valueSerializerType != null)
+                    return _valueSerializerType.AssemblyQualifiedName;
+                else
+                    return _valueSerializerTypeName;
+            }
+        }
+    }
+}
+#else
 [assembly:TypeForwardedTo(typeof(System.Windows.Markup.ValueSerializerAttribute))]
+#endif

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/InfosetObjects/XamlObjectWriter.cs

@@ -139,7 +139,7 @@ private XamlRuntime CreateRuntime(XamlObjectWriterSettings settings, XamlSchemaC
             if (settings != null)
             {
                 runtimeSettings = new XamlRuntimeSettings { IgnoreCanConvert = settings.IgnoreCanConvert };
-#if !TARGETTING35SP1
+#if !TARGETTING35SP1 && !NETSTANDARD2_0
                 if (settings.AccessLevel != null)
                 {
                     result = new PartialTrustTolerantRuntime(runtimeSettings, settings.AccessLevel, schemaContext);

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Runtime/DynamicMethodRuntime.cs

@@ -17,6 +17,7 @@
 using System.Xaml.Permissions;
 using System.Xaml.MS.Impl;
 
+#if !NETSTANDARD2_0
 namespace MS.Internal.Xaml.Runtime
 {
 
@@ -744,3 +745,4 @@ private void Emit_TypeOf(ILGenerator ilGenerator, Type type)
         }
     }
 }
+#endif

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Runtime/PartialTrustTolerantRuntime.cs

@@ -14,6 +14,7 @@
 using System.Xaml.Schema;
 using System.Xaml.Permissions;
 
+#if !NETSTANDARD2_0
 namespace MS.Internal.Xaml.Runtime
 {
     // Perf notes
@@ -464,3 +465,4 @@ private static bool IsDefaultConverter<TConverterBase>(XamlValueConverter<TConve
         }
     }
 }
+#endif

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/TypeReflector.cs

@@ -1123,7 +1123,11 @@ public bool IsComplete
                 }
             }
 
+#if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP3_0
             public new V TryAdd(K name, V member)
+#else
+            public V TryAdd(K name, V member)
+#endif
             {
                 // This instance is always held in a private field, safe to lock on
                 lock (this)