diff options
author | Leonid Shalupov <shalupov@diverse.org.ru> | 2015-03-02 20:20:53 +0300 |
---|---|---|
committer | Leonid Shalupov <shalupov@diverse.org.ru> | 2015-03-26 21:18:26 +0300 |
commit | 830bf66a13ea18dd8c6f67203d9a70b20349f1d6 (patch) | |
tree | 8ff4ff0993c45c19bb6d7954973dfe791a1e7329 /mcs/class | |
parent | 14c5e0e1440e77d554a4045ba74e71c93fc788e9 (diff) |
move System.Windows.Markup.ValueSerializerAttribute to System assembly, as Microsoft does in .NET Framework 4.5
See MSDN https://msdn.microsoft.com/en-us/library/system.windows.markup.valueserializerattribute(v=vs.110).aspx
Diffstat (limited to 'mcs/class')
-rwxr-xr-x | mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs | 51 | ||||
-rw-r--r-- | mcs/class/System.Xaml/System.Xaml-net_4_5.csproj | 1 | ||||
-rw-r--r-- | mcs/class/System.Xaml/System.Xaml.dll.sources | 1 | ||||
-rw-r--r-- | mcs/class/System/System-bare-net_4_5.csproj | 1 | ||||
-rw-r--r-- | mcs/class/System/System-net_4_5.csproj | 1 | ||||
-rw-r--r-- | mcs/class/System/System-secxml-net_4_5.csproj | 1 | ||||
-rw-r--r-- | mcs/class/System/System.dll.sources | 1 |
7 files changed, 4 insertions, 53 deletions
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs deleted file mode 100755 index 37dec5262a9..00000000000 --- a/mcs/class/System.Xaml/System.Windows.Markup/ValueSerializerAttribute.cs +++ /dev/null @@ -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; } - } -} - diff --git a/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj b/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj index 2a99850eced..61c63aeef2e 100644 --- a/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj +++ b/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj @@ -83,7 +83,6 @@ <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />
<Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />
<Compile Include="System.Windows.Markup\ValueSerializer.cs" />
- <Compile Include="System.Windows.Markup\ValueSerializerAttribute.cs" />
<Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />
<Compile Include="System.Windows.Markup\XamlDeferLoadAttribute.cs" />
<Compile Include="System.Windows.Markup\XamlSetMarkupExtensionAttribute.cs" />
diff --git a/mcs/class/System.Xaml/System.Xaml.dll.sources b/mcs/class/System.Xaml/System.Xaml.dll.sources index 57dc4a170f6..82b664bc036 100644 --- a/mcs/class/System.Xaml/System.Xaml.dll.sources +++ b/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 diff --git a/mcs/class/System/System-bare-net_4_5.csproj b/mcs/class/System/System-bare-net_4_5.csproj index 318351e55a0..55c3ed4f979 100644 --- a/mcs/class/System/System-bare-net_4_5.csproj +++ b/mcs/class/System/System-bare-net_4_5.csproj @@ -426,6 +426,7 @@ <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
+ <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
<Compile Include="..\..\build\common\SR.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
diff --git a/mcs/class/System/System-net_4_5.csproj b/mcs/class/System/System-net_4_5.csproj index 14c86b8c26f..98c2374b4b8 100644 --- a/mcs/class/System/System-net_4_5.csproj +++ b/mcs/class/System/System-net_4_5.csproj @@ -426,6 +426,7 @@ <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
+ <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
<Compile Include="..\..\build\common\SR.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
diff --git a/mcs/class/System/System-secxml-net_4_5.csproj b/mcs/class/System/System-secxml-net_4_5.csproj index bd98d626b10..25cb910f60d 100644 --- a/mcs/class/System/System-secxml-net_4_5.csproj +++ b/mcs/class/System/System-secxml-net_4_5.csproj @@ -426,6 +426,7 @@ <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
<Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
+ <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
<Compile Include="..\..\build\common\SR.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources index c8a04226986..9901dc43aeb 100644 --- a/mcs/class/System/System.dll.sources +++ b/mcs/class/System/System.dll.sources @@ -1106,6 +1106,7 @@ ReferenceSources/Win32Exception.cs ../../../external/referencesource/System/sys/system/runtime/versioning/FrameworkName.cs ../../../external/referencesource/System/sys/system/threading/Barrier.cs +../../../external/referencesource/System/sys/system/windows/markup/ValueSerializerAttribute.cs ../../../external/referencesource/System/security/system/security/permissions/typedescriptorpermission.cs |